浏览代码

Merge pull request #2061 from ThomasWaldmann/fix-vagrant-freebsd

fix the freebsd64 vagrant machine, fixes #2037
TW 8 年之前
父节点
当前提交
3b8beb98f0
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      Vagrantfile

+ 3 - 1
Vagrantfile

@@ -467,11 +467,13 @@ Vagrant.configure(2) do |config|
   end
 
   # BSD
+  # note: the FreeBSD-10.3-STABLE box needs "vagrant up" twice to start.
   config.vm.define "freebsd64" do |b|
-    b.vm.box = "geoffgarside/freebsd-10.2"
+    b.vm.box = "freebsd/FreeBSD-10.3-STABLE"
     b.vm.provider :virtualbox do |v|
       v.memory = 768
     end
+    b.ssh.shell = "sh"
     b.vm.provision "install system packages", :type => :shell, :inline => packages_freebsd
     b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("freebsd")
     b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("freebsd")