svn commit: r225499 - user/hrs/ipv6/etc/rc.d

[Hiroki Sato]

Author: hrs
Date: Mon Sep 12 01:38:24 2011
New Revision: 225499
URL: http://svn.freebsd.org/changeset/base/225499

Log:
  Use resolvconf(8) to create /etc/resolv.conf.

Modified:
  user/hrs/ipv6/etc/rc.d/resolv

Modified: user/hrs/ipv6/etc/rc.d/resolv
==============================================================================
--- user/hrs/ipv6/etc/rc.d/resolv	Mon Sep 12 01:36:54 2011	(r225498)
+++ user/hrs/ipv6/etc/rc.d/resolv	Mon Sep 12 01:38:24 2011	(r225499)
@@ -28,7 +28,7 @@
 #
 
 # PROVIDE: resolv
-# REQUIRE: netif
+# REQUIRE: netif var
 # KEYWORD: nojail
 
 . /etc/rc.subr
@@ -41,17 +41,17 @@ load_rc_config $name
 # if the info is available via dhcp/kenv
 # build the resolv.conf
 #
-if [ ! -e /etc/resolv.conf -a \
-    -n "`/bin/kenv dhcp.domain-name-servers 2> /dev/null`" ]; then
-	> /etc/resolv.conf
-
+if [ -n "`/bin/kenv dhcp.domain-name-servers 2> /dev/null`" ]; then
+	interface="`/bin/kenv boot.netif.name`"
+	(
 	if [ -n "`/bin/kenv dhcp.domain-name 2> /dev/null`" ]; then
-		echo domain `/bin/kenv dhcp.domain-name` > /etc/resolv.conf
+		echo domain `/bin/kenv dhcp.domain-name`
 	fi
 
 	set -- `/bin/kenv dhcp.domain-name-servers`
 	for ns in `IFS=','; echo $*`; do
-		echo nameserver $ns >> /etc/resolv.conf;
+		echo nameserver $ns
 	done
+	) | /sbin/resolvconf -a ${interface}:dhcp4
 fi