diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-08-30 18:21:47 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-08-30 18:21:47 +0000 |
| commit | 63aab6a1b3d1e62ef1ffa50e382ab56b2dc133dd (patch) | |
| tree | d64244eac4b1438eb1c4ac3f5d781622f08ed984 /sbin/dhclient-script | |
| parent | b4658554ad1ffb4e5ff600a7f4e7b40de2d1c8a0 (diff) | |
| download | pfsense-63aab6a1b3d1e62ef1ffa50e382ab56b2dc133dd.zip pfsense-63aab6a1b3d1e62ef1ffa50e382ab56b2dc133dd.tar.gz | |
Do not create /var/etc/resolv.conf in dhclient-script. Depend on system_resolvconf_generate() and /etc/rc.newwanip
Diffstat (limited to 'sbin/dhclient-script')
| -rwxr-xr-x | sbin/dhclient-script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/dhclient-script b/sbin/dhclient-script index 6e83744..308e06a 100755 --- a/sbin/dhclient-script +++ b/sbin/dhclient-script @@ -171,7 +171,7 @@ add_new_resolv_conf() { 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 + #cat /var/etc/resolv.conf.std > /var/etc/resolv.conf rm -f /var/etc/resolv.conf.std # Try to ensure correct ownership and permissions. @@ -264,7 +264,7 @@ EXPIRE|FAIL) # XXX Why add alias we just deleted above? add_new_alias if [ -f /var/etc/resolv.conf.save ]; then - cat /var/etc/resolv.conf.save > /var/etc/resolv.conf + #cat /var/etc/resolv.conf.save > /var/etc/resolv.conf fi ;; |
