瀏覽代碼

vagrant: upgrade openbsd box to 6.9

Thomas Waldmann 4 年之前
父節點
當前提交
e69885571a
共有 1 個文件被更改,包括 2 次插入4 次删除
  1. 2 4
      Vagrantfile

+ 2 - 4
Vagrantfile

@@ -78,13 +78,12 @@ end
 def packages_openbsd
 def packages_openbsd
   return <<-EOF
   return <<-EOF
     pkg_add bash
     pkg_add bash
-    chsh -s /usr/local/bin/bash vagrant
+    chsh -s bash vagrant
     pkg_add lz4
     pkg_add lz4
     pkg_add zstd
     pkg_add zstd
     pkg_add git  # no fakeroot
     pkg_add git  # no fakeroot
     pkg_add py3-pip
     pkg_add py3-pip
     pkg_add py3-virtualenv
     pkg_add py3-virtualenv
-    ln -sf /usr/local/bin/virtualenv-3 /usr/local/bin/virtualenv
   EOF
   EOF
 end
 end
 
 
@@ -332,11 +331,10 @@ Vagrant.configure(2) do |config|
   end
   end
 
 
   config.vm.define "openbsd64" do |b|
   config.vm.define "openbsd64" do |b|
-    b.vm.box = "openbsd64-64"
+    b.vm.box = "generic/openbsd6"
     b.vm.provider :virtualbox do |v|
     b.vm.provider :virtualbox do |v|
       v.memory = 1024 + $wmem
       v.memory = 1024 + $wmem
     end
     end
-    b.ssh.shell = "sh"
     b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant")
     b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant")
     b.vm.provision "packages openbsd", :type => :shell, :inline => packages_openbsd
     b.vm.provision "packages openbsd", :type => :shell, :inline => packages_openbsd
     b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("openbsd64")
     b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("openbsd64")