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

Bugfixes for FreeBSD 10 #189

Merged
merged 1 commit into from
Mar 13, 2014
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
1 change: 1 addition & 0 deletions packer/freebsd-10.0-amd64.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions packer/freebsd-10.0-i386.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packer/scripts/freebsd/vmtools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down