[Midnightbsd-cvs] src: resolv: Try to get useful info from dhcp fix whitespace
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Oct 26 11:18:50 EDT 2007
Log Message:
-----------
Try to get useful info from dhcp
fix whitespace
Modified Files:
--------------
src/etc/rc.d:
resolv (r1.2 -> r1.3)
-------------- next part --------------
Index: resolv
===================================================================
RCS file: /home/cvs/src/etc/rc.d/resolv,v
retrieving revision 1.2
retrieving revision 1.3
diff -Letc/rc.d/resolv -Letc/rc.d/resolv -u -r1.2 -r1.3
--- etc/rc.d/resolv
+++ etc/rc.d/resolv
@@ -29,6 +29,7 @@
#
# PROVIDE: resolv
+# REQUIRE: netif
# KEYWORD: nojail
. /etc/rc.subr
@@ -42,15 +43,15 @@
#
if [ ! -e /etc/resolv.conf -a \
-n "`/bin/kenv dhcp.domain-name-servers 2> /dev/null`" ]; then
- /bin/cat /dev/null > /etc/resolv.conf
+ > /etc/resolv.conf
if [ -n "`/bin/kenv dhcp.domain-name 2> /dev/null`" ]; then
echo domain `/bin/kenv dhcp.domain-name` > /etc/resolv.conf
fi
- set -- `/bin/kenv dhcp.domain-name-servers`
- for ns in `IFS=','; echo $*`; do
- echo nameserver $ns >> /etc/resolv.conf;
- done
+ set -- `/bin/kenv dhcp.domain-name-servers`
+ for ns in `IFS=','; echo $*`; do
+ echo nameserver $ns >> /etc/resolv.conf;
+ done
fi
More information about the Midnightbsd-cvs
mailing list