From bc5313dc583cad9a3949bd798995ab1ee398ecf6 Mon Sep 17 00:00:00 2001
From: Martin Pärtel <martin.partel@gmail.com>
Date: Sat, 13 Feb 2021 15:56:57 +0200
Subject: Refactored and unit-tested filter_special_opts. Shaved a bunch of
 yaks on the way.

---
 vagrant/debian10/Vagrantfile    |  2 +-
 vagrant/debian9/Vagrantfile     |  2 +-
 vagrant/freebsd10_3/Vagrantfile | 31 -------------------------------
 vagrant/freebsd12/Vagrantfile   | 30 ++++++++++++++++++++++++++++++
 4 files changed, 32 insertions(+), 33 deletions(-)
 delete mode 100644 vagrant/freebsd10_3/Vagrantfile
 create mode 100644 vagrant/freebsd12/Vagrantfile

(limited to 'vagrant')

diff --git a/vagrant/debian10/Vagrantfile b/vagrant/debian10/Vagrantfile
index 3a76651..d56a8f2 100644
--- a/vagrant/debian10/Vagrantfile
+++ b/vagrant/debian10/Vagrantfile
@@ -16,8 +16,8 @@ Vagrant.configure("2") do |config|
   end
 
   config.vm.provision "shell", reboot: true, inline: <<-SHELL
+    export DEBIAN_FRONTEND='noninteractive'
     apt-get update
-    DEBIAN_FRONTEND='noninteractive' apt-get dist-upgrade -y -o Dpkg::Options::="--force-confdef"
     apt-get install -y fuse3 libfuse3-dev build-essential pkg-config ruby valgrind
     apt-get clean
     echo user_allow_other > /etc/fuse.conf
diff --git a/vagrant/debian9/Vagrantfile b/vagrant/debian9/Vagrantfile
index 7f681dc..3ba1138 100644
--- a/vagrant/debian9/Vagrantfile
+++ b/vagrant/debian9/Vagrantfile
@@ -16,8 +16,8 @@ Vagrant.configure("2") do |config|
   end
 
   config.vm.provision "shell", reboot: true, inline: <<-SHELL
+    export DEBIAN_FRONTEND='noninteractive'
     apt-get update
-    DEBIAN_FRONTEND='noninteractive' apt-get dist-upgrade -y -o Dpkg::Options::="--force-confdef"
     apt-get install -y fuse libfuse-dev build-essential pkg-config ruby valgrind
     apt-get clean
     echo user_allow_other > /etc/fuse.conf
diff --git a/vagrant/freebsd10_3/Vagrantfile b/vagrant/freebsd10_3/Vagrantfile
deleted file mode 100644
index 87ba424..0000000
--- a/vagrant/freebsd10_3/Vagrantfile
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  #config.vm.box = "freebsd/FreeBSD-11.0-STABLE"  # doesn't set base_mac so can't use NAT networking :(
-  config.vm.box = "bento/freebsd-10.3"
-
-  config.vm.synced_folder ".", "/vagrant", disabled: true
-  config.vm.synced_folder "../../", "/bindfs",
-    type: "rsync",
-    rsync__auto: false,
-    rsync__exclude: ["vagrant"],
-    rsync__args: ["-av", "--delete-after"]
-
-  config.vm.provider "virtualbox" do |v|
-    v.name = "bindfs-freebsd10_3"
-  end
-
-  config.vm.provision "shell", inline: <<-SHELL
-    pkg update
-    pkg install -y fusefs-libs pkgconf ruby valgrind
-
-    kldload fuse.ko
-    echo 'fuse_load="YES"' >> /boot/loader.conf
-
-    sysctl vfs.usermount=1
-    echo vfs.usermount=1 >> /etc/sysctl.conf
-
-    pw groupmod operator -m vagrant  # For access to /dev/fuse
-  SHELL
-end
diff --git a/vagrant/freebsd12/Vagrantfile b/vagrant/freebsd12/Vagrantfile
new file mode 100644
index 0000000..213c18c
--- /dev/null
+++ b/vagrant/freebsd12/Vagrantfile
@@ -0,0 +1,30 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "roboxes/freebsd12"
+
+  config.vm.synced_folder ".", "/vagrant", disabled: true
+  config.vm.synced_folder "../../", "/bindfs",
+    type: "rsync",
+    rsync__auto: false,
+    rsync__exclude: ["vagrant"],
+    rsync__args: ["-av", "--delete-after"]
+
+  config.vm.provider "virtualbox" do |v|
+    v.name = "bindfs-freebsd12"
+  end
+
+  config.vm.provision "shell", inline: <<-SHELL
+    pkg update
+    pkg install -y fusefs-libs pkgconf ruby
+
+    kldload fuse.ko
+    echo 'fuse_load="YES"' >> /boot/loader.conf
+
+    sysctl vfs.usermount=1
+    echo vfs.usermount=1 >> /etc/sysctl.conf
+
+    pw groupmod operator -m vagrant  # For access to /dev/fuse
+  SHELL
+end
-- 
cgit v1.2.3