From 82282e70d63a7b12808e9705201cb49d47009ab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Goran=20Meki=C4=87?= <meka@tilda.center>
Date: Wed, 17 May 2023 20:13:36 +0200
Subject: [PATCH] Set resolv.conf early

---
 scripts/base-network-init.sh | 7 -------
 scripts/mkjail.sh            | 8 +++++++-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/scripts/base-network-init.sh b/scripts/base-network-init.sh
index 7f03827..a3c926c 100755
--- a/scripts/base-network-init.sh
+++ b/scripts/base-network-init.sh
@@ -100,13 +100,6 @@ dns() {
     jexec ${SERVICE} usr/local/bin/reggae-register.sh ipv6 add ${IPV6_PREFIX}${MASTER_IP6} @ ${DOMAIN}
     jexec ${SERVICE} /usr/local/bin/reggae-register.sh ipv6 add ${IPV6_PREFIX}${MASTER_IP6} network ${DOMAIN}
   fi
-  echo "search $(hostname)" >"${BASE_WORKDIR}/${SERVICE}/etc/resolv.conf"
-  if [ "${USE_IPV4}" = "yes" ]; then
-    echo "nameserver 127.0.01" >>"${BASE_WORKDIR}/${SERVICE}/etc/resolv.conf"
-  fi
-  if [ "${USE_IPV6}" = "yes" ]; then
-    echo "nameserver ::1" >>"${BASE_WORKDIR}/${SERVICE}/etc/resolv.conf"
-  fi
 }
 
 
diff --git a/scripts/mkjail.sh b/scripts/mkjail.sh
index 4985993..911a1ba 100755
--- a/scripts/mkjail.sh
+++ b/scripts/mkjail.sh
@@ -135,7 +135,13 @@ bsdinstall distextract
 sed -i "" -e "s/^Components .*/Components world/" "${BSDINSTALL_CHROOT}/etc/freebsd-update.conf"
 mkdir -p "${BSDINSTALL_CHROOT}/usr/local/etc/pkg/repos"
 echo -e "FreeBSD: {\n    url: \"pkg+http://${PKG_MIRROR}/\${ABI}/${PKG_REPO}\",\n}">"${BSDINSTALL_CHROOT}/usr/local/etc/pkg/repos/FreeBSD.conf"
-cp /etc/resolv.conf "${BSDINSTALL_CHROOT}/etc/resolv.conf"
+echo "domain ${DOMAIN}" >"${BSDINSTALL_CHROOT}/etc/resolv.conf"
+if [ "${USE_IPV4}" = "yes" ]; then
+  echo "nameserver ${INTERFACE_IP}" >>"${BSDINSTALL_CHROOT}/etc/resolv.conf"
+fi
+if [ "${USE_IPV6}" = "yes" ]; then
+  echo "nameserver ${IPV6_PREFIX}${INTERFACE_IP6}" >>"${BSDINSTALL_CHROOT}/etc/resolv.conf"
+fi
 if [ "${UPDATE}" != "no" -a "${OS_VERSION_NAME}" = "RELEASE" ]; then
   chroot "${BSDINSTALL_CHROOT}" freebsd-update --currently-running "${OS_VERSION}-${OS_VERSION_NAME}" fetch install
 fi