diff options
| author | alfred <alfred@FreeBSD.org> | 2002-02-01 18:46:58 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2002-02-01 18:46:58 +0000 |
| commit | 60c95d795161a605edde5f9879b1d53658c281e8 (patch) | |
| tree | 8e8d8ff90f777308b245c00d009bc1dfe2a18eef /sbin | |
| parent | bfbf894c825667b4b8b5afa157601fe3c9541d3d (diff) | |
| download | FreeBSD-src-60c95d795161a605edde5f9879b1d53658c281e8.zip FreeBSD-src-60c95d795161a605edde5f9879b1d53658c281e8.tar.gz | |
If the dhcpd server doesn't provide a domain name or dns servers then
don't clobber /etc/resolv.conf
Add $FreeBSD.
Submitted by: an j. peterson" <rbw@myplace.org>
Verified fix in: dhcp-3.0.1rc6
PR: misc/34455
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/dhclient/dhclient-script.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sbin/dhclient/dhclient-script.sh b/sbin/dhclient/dhclient-script.sh index 7379480..d35eafe 100644 --- a/sbin/dhclient/dhclient-script.sh +++ b/sbin/dhclient/dhclient-script.sh @@ -35,6 +35,7 @@ ############################################################################# # $MindStep_Id: dhclient-script.sh,v 1.8 1999/12/07 22:11:08 patrick Exp $ # $MindStep_Tag: CONTRIB_19991207 $ +# $FreeBSD$ ############################################################################# @@ -82,10 +83,12 @@ post_state_TIMEOUT_hook () { } ############################################################################# make_resolv_conf () { - echo search $new_domain_name >/etc/resolv.conf - for nameserver in $new_domain_name_servers; do - echo nameserver $nameserver >>/etc/resolv.conf - done + if [ "x$new_domain_name" != x ] && [ "x$new_domain_name_servers" != x ]; then + echo search $new_domain_name >/etc/resolv.conf + for nameserver in $new_domain_name_servers; do + echo nameserver $nameserver >>/etc/resolv.conf + done + fi } # Must be used on exit. Invokes the local dhcp client exit hooks, if any. |
