From 4eb4b18a0fb3c39c5bbb241ad4f0366b6c5e890c Mon Sep 17 00:00:00 2001 From: jim-p Date: Sat, 9 Apr 2011 12:00:53 -0400 Subject: Revert changes to dhclient-script. Appears to have broken DNS servers from DHCP. Ticket #1428 --- sbin/dhclient-script | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sbin/dhclient-script b/sbin/dhclient-script index ccbde7d..e51132e 100755 --- a/sbin/dhclient-script +++ b/sbin/dhclient-script @@ -232,14 +232,13 @@ add_new_resolv_conf() { if [ -n "$new_domain_name_servers" ]; then /bin/rm -f /var/etc/nameserver_$interface for nameserver in $new_domain_name_servers; do - nameserver_sanitized=`echo '$nameserver' | /usr/bin/egrep -o '([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[0-9a-f]+:)'` # Add a route to the nameserver out the correct interface # so that mulitple wans work correctly with multiple dns # also backup the nameserver for later route removal - echo '$nameserver_sanitized' >>/var/etc/nameserver_$interface - $ROUTE add $nameserver_sanitized -iface $interface + echo $nameserver >>/var/etc/nameserver_$interface + $ROUTE add $nameserver -iface $interface done - echo $new_domain_name | /usr/bin/egrep -o '([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[0-9a-f]+:)' >/var/etc/searchdomain_$interface + echo $new_domain_name >/var/etc/searchdomain_$interface fi return 0 -- cgit v1.1