mirror of
https://github.com/borgbackup/borg.git
synced 2024-12-24 16:55:36 +00:00
Merge pull request #6498 from ThomasWaldmann/vagrant-fixes-master
vagrant: use generic/freebsd13, FUSE fixes
This commit is contained in:
commit
28731c56d1
1 changed files with 2 additions and 4 deletions
6
Vagrantfile
vendored
6
Vagrantfile
vendored
|
@ -57,7 +57,7 @@ def packages_freebsd
|
||||||
# make FUSE work
|
# make FUSE work
|
||||||
echo 'fuse_load="YES"' >> /boot/loader.conf
|
echo 'fuse_load="YES"' >> /boot/loader.conf
|
||||||
echo 'vfs.usermount=1' >> /etc/sysctl.conf
|
echo 'vfs.usermount=1' >> /etc/sysctl.conf
|
||||||
kldload fuse
|
kldload fusefs
|
||||||
sysctl vfs.usermount=1
|
sysctl vfs.usermount=1
|
||||||
pw groupmod operator -M vagrant
|
pw groupmod operator -M vagrant
|
||||||
# /dev/fuse has group operator
|
# /dev/fuse has group operator
|
||||||
|
@ -66,8 +66,6 @@ def packages_freebsd
|
||||||
pkg update
|
pkg update
|
||||||
yes | pkg upgrade
|
yes | pkg upgrade
|
||||||
echo 'export BORG_OPENSSL_PREFIX=/usr' >> ~vagrant/.bash_profile
|
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
|
EOF
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -320,7 +318,7 @@ Vagrant.configure(2) do |config|
|
||||||
end
|
end
|
||||||
|
|
||||||
config.vm.define "freebsd64" do |b|
|
config.vm.define "freebsd64" do |b|
|
||||||
b.vm.box = "freebsd121-64"
|
b.vm.box = "generic/freebsd13"
|
||||||
b.vm.provider :virtualbox do |v|
|
b.vm.provider :virtualbox do |v|
|
||||||
v.memory = 1024 + $wmem
|
v.memory = 1024 + $wmem
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue