Pull up following revision(s) (requested by kim in ticket #1537): share/man/man5/rc.conf.5: revision 1.172 etc/rc.d/network: revision 1.75 Allow rc.conf to setup resolv.conf via resolvconf(8). This allows all static network config to be in rc.conf rather than spread across files.

(martin)

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: network,v 1.71 2016/03/06 18:50:06 christos Exp $
+# $NetBSD: network,v 1.71.8.1 2020/04/23 13:43:42 martin Exp $
 #
 
 # PROVIDE: network
@@ -52,6 +52,7 @@
 	have_inet6 &&
 	network_start_ipv6_autoconf
 	network_wait_dad
+	network_start_resolv
 	network_start_local
 }
 
@@ -454,6 +455,32 @@
 	fi
 }
 
+network_start_resolv()
+{
+	resconf=
+
+	if [ -n "$dns_domain" ]; then
+		resconf="${resconf}domain $dns_domain$nl"
+	fi
+	if [ -n "$dns_search" ]; then
+		resconf="${resconf}search $dns_search$nl"
+	fi
+	for n in $dns_nameservers; do
+		resconf="${resconf}nameserver $n$nl"
+	done
+	if [ -n "$dns_sortlist" ]; then
+		resconf="${resconf}sortlist $dns_sortlist$nl"
+	fi
+	if [ -n "$dns_options" ]; then
+		resconf="${resconf}options $dns_options$nl"
+	fi
+	if [ -n "$resconf" ]; then
+		resconf="# Generated by /etc/rc.d/network$nl$resconf"
+		echo 'Configuring resolv.conf'
+		printf %s "$resconf" | resolvconf -m "${dns_metric:-0}" -a network
+	fi
+}
+
 network_start_local()
 {
 	# XXX this must die
@@ -467,6 +494,7 @@
 	echo "Stopping network."
 
 	network_stop_local
+	network_stop_resolv
 	network_stop_aliases
 	[ "$net_interfaces" != NO ] &&
 	network_stop_interfaces
@@ -479,6 +507,11 @@
 	if [ -s /etc/netstart.local ]; then
 		sh /etc/netstart.local stop
 	fi
+}
+
+network_stop_resolv()
+{
+	resolvconf -f -d network
 }
 
 network_stop_aliases()