From 2d36cfc14d602cba258095ac28ae460c653aa450 Mon Sep 17 00:00:00 2001 From: mbr Date: Mon, 28 Jul 2003 22:25:20 +0000 Subject: Fix dhclient infinite loop on ro /etc/resolv.conf Submitted by: C J Michaels Reviewed by: David W. Hankins PR: 38778 ISC-Bug: 5754 --- contrib/isc-dhcp/client/scripts/freebsd | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'contrib') diff --git a/contrib/isc-dhcp/client/scripts/freebsd b/contrib/isc-dhcp/client/scripts/freebsd index f9d61b5..b79a440 100755 --- a/contrib/isc-dhcp/client/scripts/freebsd +++ b/contrib/isc-dhcp/client/scripts/freebsd @@ -13,13 +13,19 @@ fi make_resolv_conf() { if [ x"$new_domain_name_servers" != x ]; then if [ "x$new_domain_name" != x ]; then - echo search $new_domain_name >/etc/resolv.conf + ( echo search $new_domain_name >/etc/resolv.conf ) + exit_status=$? else - rm /etc/resolv.conf + ( rm /etc/resolv.conf ) + exit_status=$? + fi + if [ $exit_status -ne 0 ]; then + $LOGGER "WARNING: Unable to update resolv.conf: Error $exit_status" + else + for nameserver in $new_domain_name_servers; do + ( echo nameserver $nameserver >>/etc/resolv.conf ) + done fi - for nameserver in $new_domain_name_servers; do - echo nameserver $nameserver >>/etc/resolv.conf - done fi } -- cgit v1.1