From e1d41cd4d750c45deee3821e98de821130c560f0 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Thu, 13 Mar 2014 09:58:59 -0400 Subject: [PATCH] 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