Skip to content

Commit

Permalink
Merge pull request #5425 from sarcasticadmin/sa/freebsd-vagrant-fix
Browse files Browse the repository at this point in the history
Freebsd vagrant fixes
  • Loading branch information
notnoop authored Mar 17, 2019
2 parents 24eaa4b + 20a1634 commit 27924bc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#

LINUX_BASE_BOX = "bento/ubuntu-16.04"
FREEBSD_BASE_BOX = "jen20/FreeBSD-11.1-RELEASE"
FREEBSD_BASE_BOX = "freebsd/FreeBSD-11.2-STABLE"

Vagrant.configure(2) do |config|
# Compilation and development boxes
Expand Down Expand Up @@ -49,9 +49,10 @@ Vagrant.configure(2) do |config|
config.vm.define "freebsd", autostart: false, primary: false do |vmCfg|
vmCfg.vm.box = FREEBSD_BASE_BOX
vmCfg.vm.hostname = "freebsd"
vmCfg.ssh.shell = "sh"
vmCfg = configureProviders vmCfg,
cpus: suggestedCPUCores()

vmCfg.vm.network "private_network", type: "dhcp"
vmCfg.vm.synced_folder '.',
'/opt/gopath/src/github.com/hashicorp/nomad',
type: "nfs",
Expand Down
2 changes: 1 addition & 1 deletion scripts/vagrant-freebsd-priv-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ EOT
pkg update

pkg install -y \
editors/vim-lite \
editors/vim-tiny \
devel/git \
devel/gmake \
lang/go \
Expand Down

0 comments on commit 27924bc

Please sign in to comment.