From 28aeeff7a0c43c684df81f04445e47f052ed7801 Mon Sep 17 00:00:00 2001
From: Matt Behrens <matt@zigg.com>
Date: Sat, 7 Nov 2015 16:51:06 -0500
Subject: [PATCH 1/2] update VirtualBox settings to match current built-in OS X
 template

---
 packer/template.json | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packer/template.json b/packer/template.json
index 7120e10..10e13be 100644
--- a/packer/template.json
+++ b/packer/template.json
@@ -60,7 +60,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",
       "iso_checksum_type": "md5",
       "iso_checksum": "{{user `iso_checksum`}}",
@@ -77,13 +77,14 @@
         ["modifyvm", "{{.Name}}", "--boot1", "dvd"],
         ["modifyvm", "{{.Name}}", "--boot2", "disk"],
         ["modifyvm", "{{.Name}}", "--chipset", "ich9"],
-        ["modifyvm", "{{.Name}}", "--cpuidset", "00000001", "000306a9", "00020800", "80000201", "178bfbff"],
         ["modifyvm", "{{.Name}}", "--firmware", "efi"],
         ["modifyvm", "{{.Name}}", "--hpet", "on"],
         ["modifyvm", "{{.Name}}", "--keyboard", "usb"],
         ["modifyvm", "{{.Name}}", "--memory", "2048"],
         ["modifyvm", "{{.Name}}", "--mouse", "usbtablet"],
-        ["modifyvm", "{{.Name}}", "--vram", "9"]
+        ["modifyvm", "{{.Name}}", "--usbehci", "on"],
+        ["modifyvm", "{{.Name}}", "--vram", "16"],
+        ["storagectl", "{{.Name}}", "--name", "IDE Controller", "--remove"]
       ]
     }
   ],
@@ -131,8 +132,8 @@
     "facter_version": "latest",
     "hiera_version": "latest",
     "install_vagrant_keys": "true",
-    "iso_checksum": "aff67f81dfbad7afda56c423473d61a6",
-    "iso_url": "OSX_InstallESD_10.9.3_13D65.dmg",
+    "iso_checksum": "b78fef812ca50da24381e45e56fb9285",
+    "iso_url": "OSX_InstallESD_10.11.1_15B42.dmg",
     "password": "vagrant",
     "puppet_version": "latest",
     "update_system": "true",

From af740d97926e3d58d1d663b18a01026dc41aac88 Mon Sep 17 00:00:00 2001
From: Matt Behrens <matt@zigg.com>
Date: Sat, 7 Nov 2015 21:24:20 -0500
Subject: [PATCH 2/2] update README to reflect that cpuidset is no longer
 needed

---
 README.md | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/README.md b/README.md
index e0b6271..a863aa8 100644
--- a/README.md
+++ b/README.md
@@ -130,16 +130,6 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-#### Additional VM configuration for Packer
-
-So far we've seen that the `--cpuidset` option needs to be passed to `modifyvm` as a line in the packer template if a Haswell Intel Mac is used to build the VM, at least as of VirtualBox 4.3.12. It seems to cause a VM crash on at least one older Mac, a Core 2 Duo-based 2010 Mac Mini, though did not cause issues on an Ivy Bridge 2013 iMac I tested. If it's missing on a Haswell Mac, however, the VM hangs indefinitely. This behaviour is likely to change over time as Oracle keeps up with support for OS X guests.
-
-```json
-      "vboxmanage": [
-        ["modifyvm", "{{.Name}}", "--cpuidset", "00000001", "000306a9", "00020800", "80000201", "178bfbff"],
-      ]
-```
-
 
 ## Box sizes