Merge branch 'master' into prl-custom

* master: Removed some more unnecessary firmware packages chef#299 OpenSUSE 13.2 should specify netdevice=eth0 Update to OpenSuSE 13.2. Closes chef#298 Convert FreeBSD 9 to use pkgng. Closes chef#296. Implement support for SLES 12. Closes chef#294. Updated FreeBSD boxes to 10.1 in README. Also, i386 boxes are now available. Fixed incorrect output filename. Update to FreeBSD 10.1. Closes chef#292. Minimal support for a compilation environment. Updated solaris 10 defs for u5 and u11 Update travis to use newest Packer
legal90 · Dec 22, 2014 · 00a6e84 · 00a6e84
2 parents f5fc997 + a24ef53
commit 00a6e84
Show file tree

Hide file tree

Showing 23 changed files with 1,430 additions and 214 deletions.
diff --git 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
diff --git 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)

diff --git 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
@@ -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
@@ -11,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
diff --git a/packer/freebsd-10.0-amd64.json → packer/freebsd-10.1-amd64.json b/packer/freebsd-10.0-amd64.json → packer/freebsd-10.1-amd64.json
@@ -22,35 +22,31 @@
       "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>"
+        "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 -",
       "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,35 +91,31 @@
       "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>"
+        "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,
       "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",
+      "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 → packer/freebsd-10.1-i386.json b/packer/freebsd-10.0-i386.json → packer/freebsd-10.1-i386.json
@@ -22,35 +22,31 @@
       "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>"
+        "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 -",
       "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,35 +91,31 @@
       "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>"
+        "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 -",
       "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-i386_chef-{{user `chef_version`}}.box",
       "override": {
         "parallels": {
           "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb"

diff --git 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

diff --git a/packer/http/freebsd-10.0/install.sh → packer/http/freebsd-10.1/install.sh b/packer/http/freebsd-10.0/install.sh → packer/http/freebsd-10.1/install.sh