Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

macOS Sierra support #715

Merged
merged 2 commits into from
Nov 15, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
234 changes: 234 additions & 0 deletions macos-10.12.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
15 changes: 14 additions & 1 deletion scripts/macosx/update.sh
Original file line number Diff line number Diff line change
@@ -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