Merge pull request #318 from mekanix/feature/automatic-dns

Let DHCP set resolv.conf
cbsd · Apr 14, 2023 · f0d78e1 · f0d78e1
2 parents a1bb595 + e3454a2
commit f0d78e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/scripts/base-network-init.sh b/scripts/base-network-init.sh
@@ -100,6 +100,13 @@ 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
@@ -164,14 +164,7 @@ if [ "${NAME}" = "network" ]; then
   sed -e "s;HOST;${HOST};g" \
       -e "s;BASE_WORKDIR;${BASE_WORKDIR};g" \
       -e "s;INTERFACE;${INTERFACE};g" \
-    "${SCRIPT_DIR}/../templates/network-jail.conf" >"/etc/jail.conf.d/${NAME}.conf"
-  echo "search $(hostname)" >"${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
+      "${SCRIPT_DIR}/../templates/network-jail.conf" >"/etc/jail.conf.d/${NAME}.conf"
 else
   MOUNTS=$(get_mounts)
   DEPENDS=$(get_dependencies)