[src/netbsd-1-6]: src/usr.sbin/dhcp/clientscript Pullup rev 1.5 (requested by...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9b911e1ded9b
branches:  netbsd-1-6
changeset: 531094:9b911e1ded9b
user:      jmc <jmc%NetBSD.org@localhost>
date:      Fri Mar 12 05:23:55 2004 +0000

description:
Pullup rev 1.5 (requested by aymeric in ticket #1546)

Update resolv.conf if we have new nameservers. Don't require a domain, because
it is not needed.

diffstat:

 usr.sbin/dhcp/clientscript/dhclient-script |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r 1f9ccba58be8 -r 9b911e1ded9b usr.sbin/dhcp/clientscript/dhclient-script
--- a/usr.sbin/dhcp/clientscript/dhclient-script        Fri Mar 12 05:19:07 2004 +0000
+++ b/usr.sbin/dhcp/clientscript/dhclient-script        Fri Mar 12 05:23:55 2004 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: dhclient-script,v 1.4 2002/04/10 10:11:41 enami Exp $
+# $NetBSD: dhclient-script,v 1.4.2.1 2004/03/12 05:23:55 jmc Exp $
 
 ENTERHOOKS=/etc/dhclient-enter-hooks
 EXITHOOKS=/etc/dhclient-exit-hooks
@@ -8,8 +8,7 @@
 SIGNATURE="# Created by dhclient at: "
 
 make_resolv_conf() {
-       if [ \( ! -z "$new_domain_name" \) -a \
-            \( ! -z "$new_domain_name_servers" \) ]; then
+       if [ ! -z "$new_domain_name_servers" ]; then
                if [ -f $RESOLV ]
                then
                        while read line; do