diff options
author | Renato Botelho <renato.botelho@bluepex.com> | 2010-09-28 10:19:40 -0300 |
---|---|---|
committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-09-28 10:19:40 -0300 |
commit | 43652f2fecfeb7ed4de28d697d515197ff1e3100 (patch) | |
tree | 962805777516af930939b2a9194927108d8a8319 /etc/inc/interfaces.inc | |
parent | ad9db2a956814c4e04188b177e37061e7b310472 (diff) | |
parent | 7eab33095e8f2293a43ec03c7c6bf002c084bdb2 (diff) | |
download | pfsense-43652f2fecfeb7ed4de28d697d515197ff1e3100.zip pfsense-43652f2fecfeb7ed4de28d697d515197ff1e3100.tar.gz |
Merge remote branch 'mainline/master' into inc
Diffstat (limited to 'etc/inc/interfaces.inc')
-rw-r--r-- | etc/inc/interfaces.inc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 74efd96..f4d224e 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -886,6 +886,8 @@ function interface_bring_down($interface = "wan", $destroy = false) { unlink_if_exists("{$g['tmp_path']}/{$realif}up"); unlink_if_exists("{$g['vardb_path']}/{$interface}ip"); unlink_if_exists("{$g['tmp_path']}/{$realif}_router"); + unlink_if_exists("{$g['varetc_path']}/nameserver_{$realif}"); + unlink_if_exists("{$g['varetc_path']}/searchdomain_{$realif}"); /* hostapd and wpa_supplicant do not need to be running when the interface is down. * They will also use 100% CPU if running after the wireless clone gets deleted. */ @@ -2544,15 +2546,15 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven /* reload ipsec tunnels */ vpn_ipsec_configure(); + /* restart dnsmasq */ + services_dnsmasq_configure(); + /* update dyndns */ services_dyndns_configure($interface); /* force DNS update */ services_dnsupdate_process($interface); - /* restart dnsmasq */ - services_dnsmasq_configure(); - /* reload captive portal */ captiveportal_init_rules(); |