Selaa lähdekoodia

Merge pull request #6498 from ThomasWaldmann/vagrant-fixes-master

vagrant: use generic/freebsd13, FUSE fixes
TW 3 vuotta sitten
vanhempi
sitoutus
28731c56d1
1 muutettua tiedostoa jossa 2 lisäystä ja 4 poistoa
  1. 2 4
      Vagrantfile

+ 2 - 4
Vagrantfile

@@ -57,7 +57,7 @@ def packages_freebsd
     # make FUSE work
     echo 'fuse_load="YES"' >> /boot/loader.conf
     echo 'vfs.usermount=1' >> /etc/sysctl.conf
-    kldload fuse
+    kldload fusefs
     sysctl vfs.usermount=1
     pw groupmod operator -M vagrant
     # /dev/fuse has group operator
@@ -66,8 +66,6 @@ def packages_freebsd
     pkg update
     yes | pkg upgrade
     echo 'export BORG_OPENSSL_PREFIX=/usr' >> ~vagrant/.bash_profile
-    echo 'export BORG_LIBXXHASH_PREFIX=/usr/local' >> ~vagrant/.bash_profile
-    echo 'export BORG_LIBDEFLATE_PREFIX=/usr/local' >> ~vagrant/.bash_profile
   EOF
 end
 
@@ -320,7 +318,7 @@ Vagrant.configure(2) do |config|
   end
 
   config.vm.define "freebsd64" do |b|
-    b.vm.box = "freebsd121-64"
+    b.vm.box = "generic/freebsd13"
     b.vm.provider :virtualbox do |v|
       v.memory = 1024 + $wmem
     end