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

vagrant: use generic/freebsd13, FUSE fixes
This commit is contained in:
TW 2022-03-26 22:55:32 +01:00 committed by GitHub
commit 28731c56d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions

6
Vagrantfile vendored
View File

@ -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