From a5613ec000920e8de958af418e5f9e5adb029255 Mon Sep 17 00:00:00 2001
From: Kris Lamoureux <kris@lamoureux.io>
Date: Tue, 4 Mar 2025 21:36:19 -0500
Subject: [PATCH] Improve storage handling and VM customization

- Replace NFS with rsync for host-to-guest filesharing
- Switch to qcow2 sparse files, enabling thin provisioning
- Configure serial numbers to improve file device identification
- Support custom provisioning through optional override scripts
- Fix .gitignore
---
 .gitignore  |  2 +-
 Vagrantfile | 85 +++++++++++++++++++++++++++++++++--------------------
 2 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8000dd9..17cb070 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-.vagrant
+.vagrant*
diff --git a/Vagrantfile b/Vagrantfile
index 537728e..bad4c92 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -9,14 +9,20 @@ if File.exist?(settings_path)
   settings = YAML.load_file(settings_path)
 end
 
+VAGRANT_NAME = settings['VAGRANT_NAME'] || 'zfstest'
 VAGRANT_BOX  = settings['VAGRANT_BOX']  || 'debian/bookworm64'
+VAGRANT_PROV = settings['VAGRANT_PROV'] || true
 VAGRANT_CPUS = settings['VAGRANT_CPUS'] || 4
 VAGRANT_MEM  = settings['VAGRANT_MEM']  || 4096
-NUM_DISKS    = settings['NUM_DISKS']    || 12
-DISK_SIZE    = settings['DISK_SIZE']    || 1024
+VAGRANT_SH   = settings['VAGRANT_SH']   || ''
+NUM_DISKS    = settings['NUM_DISKS']    || 16
+DISK_SIZE    = settings['DISK_SIZE']    || '18T'
 
 Vagrant.configure("2") do |config|
   config.vm.box = VAGRANT_BOX
+  config.vm.hostname = VAGRANT_NAME
+  config.vm.synced_folder ".", "/vagrant", type: "rsync",
+    rsync__exclude: ".git"
 
   config.vm.provider :libvirt do |libvirt|
     libvirt.cpus   = VAGRANT_CPUS
@@ -34,38 +40,53 @@ Vagrant.configure("2") do |config|
       end
 
       libvirt.storage :file, \
-        :size => "#{DISK_SIZE}M", \
-        :type => 'raw', \
-        :device => "vdz#{device_suffix}"
+        :size => "#{DISK_SIZE}", \
+        :type => 'qcow2', \
+        :sparse => true, \
+        :device => "vdz#{device_suffix}", \
+        :serial => "VDZ#{device_suffix.upcase}"
       end
     end
 
-  config.vm.provision "shell", inline: <<-SHELL
-    if [ -f /etc/os-release ]; then
-      . /etc/os-release
-      OS_ID=$ID
-    else
-      echo "Cannot detect OS, exiting"
-      exit 1
-    fi
+  if VAGRANT_PROV
+    config.vm.provision "shell", inline: <<-SHELL
+      if [ -f /etc/os-release ]; then
+        . /etc/os-release
+        OS_ID=$ID
+      else
+        echo "Cannot detect OS, exiting"
+        exit 1
+      fi
 
-    if [ "$OS_ID" = "debian" ]; then
-      export DEBIAN_FRONTEND=noninteractive
-      SOURCES_LIST="/etc/apt/sources.list.d/contrib.list"
-      echo "deb http://deb.debian.org/debian/ ${VERSION_CODENAME} contrib" > "$SOURCES_LIST"
-      apt-get update
-      apt-get install -y linux-headers-$(uname -r)
-      apt-get install -y zfsutils-linux
-    elif [ "$OS_ID" = "rocky" ]; then
-      dnf install -y epel-release
-      dnf config-manager --enable epel
-      dnf install -y https://zfsonlinux.org/epel/zfs-release-2-3$(rpm --eval "%{dist}").noarch.rpm
-      dnf config-manager --disable zfs
-      dnf config-manager --enable zfs-kmod
-      dnf install -y zfs
-    else
-      echo "Unsupported OS: $OS_ID"
-      exit 1
-    fi
-  SHELL
+      if [ "$OS_ID" = "debian" ]; then
+        export DEBIAN_FRONTEND=noninteractive
+        SOURCES_LIST="/etc/apt/sources.list.d/contrib.list"
+        echo "deb http://deb.debian.org/debian/ ${VERSION_CODENAME} contrib" > "$SOURCES_LIST"
+        apt-get update
+        apt-get install -y linux-headers-$(uname -r)
+        apt-get install -y zfsutils-linux
+      elif [ "$OS_ID" = "rocky" ]; then
+        dnf install -y epel-release
+        dnf config-manager --enable epel
+        dnf install -y https://zfsonlinux.org/epel/zfs-release-2-3$(rpm --eval "%{dist}").noarch.rpm
+        dnf config-manager --disable zfs
+        dnf config-manager --enable zfs-kmod
+        dnf install -y zfs
+      else
+        echo "Unsupported OS: $OS_ID"
+        exit 1
+      fi
+    SHELL
+  end
+
+  if VAGRANT_SH != ''
+    config.vm.provision "shell", inline: <<-SHELL
+      if [ -f /vagrant/scratch/#{VAGRANT_SH} ]; then
+        /bin/bash /vagrant/scratch/#{VAGRANT_SH}
+      else
+        echo "ERROR: /vagrant/scratch/#{VAGRANT_SH} not found"
+        exit 1
+      fi
+    SHELL
+  end
 end