From e8a755ab1bee05ea29f9b138108e0207c06db9e3 Mon Sep 17 00:00:00 2001
From: Ladar Levison <ladar@lavabit.com>
Date: Fri, 27 Oct 2023 01:17:54 -0500
Subject: [PATCH] Fixed DragonFly 6 config.

---
 http/generic.dragonflybsd.vagrant.cfg  | 15 ++++++++++-----
 http/generic.dragonflybsd6.vagrant.cfg | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/http/generic.dragonflybsd.vagrant.cfg b/http/generic.dragonflybsd.vagrant.cfg
index 1fc378ca1..ed23e18a3 100644
--- a/http/generic.dragonflybsd.vagrant.cfg
+++ b/http/generic.dragonflybsd.vagrant.cfg
@@ -109,7 +109,7 @@ EOF
 [ ! -d /mnt/usr/local/etc/pkg/repos/ ] && mkdir -p /mnt/usr/local/etc/pkg/repos/
 cat <<-EOF > /mnt/usr/local/etc/pkg/repos/df-latest.conf
 Avalon: {
-        url             : http://mirror-master.dragonflybsd.org/dports/\${ABI}/LATEST,
+        url             : https://mirror-master.dragonflybsd.org/dports/\${ABI}/LATEST,
         mirror_type     : NONE,
         signature_type  : NONE,
         pubkey          : NONE,
@@ -118,10 +118,15 @@ Avalon: {
 }
 EOF
 
-ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 chroot /mnt pkg install gsed
-ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 chroot /mnt pkg install curl
-ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 chroot /mnt pkg install sudo
-ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 chroot /mnt pkg install bash
+# The pkg command requires a valid /dev/null path, so we fake it with an
+# empty file.
+touch /mnt/dev/null
+chroot /mnt /bin/sh -c 'ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg update'
+chroot /mnt /bin/sh -c 'ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install pkg'
+chroot /mnt /bin/sh -c 'ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg update'
+chroot /mnt /bin/sh -c 'ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install gsed'
+chroot /mnt /bin/sh -c 'ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install bash'
+rm -f /mnt/dev/null
 
 # Setup bash a valid login shell.
 chroot /mnt ln /usr/local/bin/bash /usr/bin/bash
diff --git a/http/generic.dragonflybsd6.vagrant.cfg b/http/generic.dragonflybsd6.vagrant.cfg
index 2e9caf424..8b79ae82f 100644
--- a/http/generic.dragonflybsd6.vagrant.cfg
+++ b/http/generic.dragonflybsd6.vagrant.cfg
@@ -109,7 +109,7 @@ EOF
 [ ! -d /mnt/usr/local/etc/pkg/repos/ ] && mkdir -p /mnt/usr/local/etc/pkg/repos/
 cat <<-EOF > /mnt/usr/local/etc/pkg/repos/df-latest.conf
 Avalon: {
-        url             : http://mirror-master.dragonflybsd.org/dports/\${ABI}/LATEST,
+        url             : https://mirror-master.dragonflybsd.org/dports/\${ABI}/LATEST,
         mirror_type     : NONE,
         signature_type  : NONE,
         pubkey          : NONE,
@@ -118,10 +118,15 @@ Avalon: {
 }
 EOF
 
-ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 chroot /mnt pkg install gsed
-ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 chroot /mnt pkg install curl
-ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 chroot /mnt pkg install sudo
-ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 chroot /mnt pkg install bash
+# The pkg command requires a valid /dev/null path, so we fake it with an
+# empty file.
+touch /mnt/dev/null
+chroot /mnt /bin/sh -c 'ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg update'
+chroot /mnt /bin/sh -c 'ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install --yes pkg'
+chroot /mnt /bin/sh -c 'ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg update'
+chroot /mnt /bin/sh -c 'ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install --yes gsed'
+chroot /mnt /bin/sh -c 'ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install --yes bash'
+rm -f /mnt/dev/null
 
 # Setup bash a valid login shell.
 chroot /mnt ln /usr/local/bin/bash /usr/bin/bash