diff options
author | Jeb Campbell <jeb-c4@pfsense.org> | 2005-08-30 19:12:56 +0000 |
---|---|---|
committer | Jeb Campbell <jeb-c4@pfsense.org> | 2005-08-30 19:12:56 +0000 |
commit | aad37fd2147b6994f7ded269290776982ca75290 (patch) | |
tree | b9011895aeeb8b8eb11300c6e79adf551fb5ff8d /sbin | |
parent | 03af9b1a76337fb19370920705ca9629ad8c1405 (diff) | |
download | pfsense-aad37fd2147b6994f7ded269290776982ca75290.zip pfsense-aad37fd2147b6994f7ded269290776982ca75290.tar.gz |
Dns from dhcp fixes for GG to test.
Diffstat (limited to 'sbin')
-rwxr-xr-x | sbin/dhclient-script | 41 |
1 files changed, 3 insertions, 38 deletions
diff --git a/sbin/dhclient-script b/sbin/dhclient-script index 7fb0f4c..ff1e029 100755 --- a/sbin/dhclient-script +++ b/sbin/dhclient-script @@ -136,52 +136,17 @@ add_new_routes() { } add_new_resolv_conf() { - # XXX Old code did not create/update resolv.conf unless both - # $new_domain_name and $new_domain_name_servers were provided. PR - # #3135 reported some ISP's only provide $new_domain_name_servers and - # thus broke the script. This code creates the resolv.conf if either - # are provided. - - rm -f /var/etc/resolv.conf.std - - if [ -n "$new_domain_name" ]; then - echo "search $new_domain_name" >>/var/etc/resolv.conf.std - fi rm -f /var/etc/nameservers.conf if [ -n "$new_domain_name_servers" ]; then for nameserver in $new_domain_name_servers; do - echo "$nameserver" >>/var/etc/resolv.conf.std echo $nameserver >>/var/etc/nameservers.conf - echo $new_domain_name >/var/etc/defaultdomain.conf done + echo $new_domain_name >/var/etc/defaultdomain.conf fi - - if [ -f /var/etc/resolv.conf.std ]; then - if [ -f /var/etc/resolv.conf.tail ]; then - cat /var/etc/resolv.conf.tail >>/var/etc/resolv.conf.std - fi - - # In case (e.g. during OpenBSD installs) /var/etc/resolv.conf - # is a symbolic link, take care to preserve the link and write - # the new data in the correct location. - - if [ -f /var/etc/resolv.conf ]; then - cat /var/etc/resolv.conf > /var/etc/resolv.conf.save - fi - cat /var/etc/resolv.conf.std > /var/etc/nameservers.conf - #cat /var/etc/resolv.conf.std > /var/etc/resolv.conf - rm -f /var/etc/resolv.conf.std - - # Try to ensure correct ownership and permissions. - chown -RL root:wheel /var/etc/resolv.conf - chmod -RL 644 /var/etc/resolv.conf - - return 0 - fi - - return 1 + + return 0 } # Must be used on exit. Invokes the local dhcp client exit hooks, if any. |