diff options
| author | Renato Botelho <renato@netgate.com> | 2016-09-02 10:31:33 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-09-02 10:31:33 -0300 |
| commit | b85d0e0397f218c2fcb45070ec7811c9dd0dd060 (patch) | |
| tree | 86f85e95fc8716ff8221bdfb495291087cb30a8c /src/etc/inc/interfaces.inc | |
| parent | 59900c5c3de0a66b68e01734d5d946f6d754705c (diff) | |
| parent | 509e9357df4755a4fe5d1d9b20eda65bafb855e7 (diff) | |
| download | pfsense-b85d0e0397f218c2fcb45070ec7811c9dd0dd060.zip pfsense-b85d0e0397f218c2fcb45070ec7811c9dd0dd060.tar.gz | |
Merge pull request #3122 from NewEraCracker/patch-11
Diffstat (limited to 'src/etc/inc/interfaces.inc')
| -rw-r--r-- | src/etc/inc/interfaces.inc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 21b2f78..3bfc16f 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -1158,16 +1158,16 @@ function interfaces_configure() { /* reload IPsec tunnels */ vpn_ipsec_configure(); - /* reload dhcpd (interface enabled/disabled status may have changed) */ - services_dhcpd_configure(); - + /* restart dns servers (defering dhcpd reload) */ if (isset($config['dnsmasq']['enable'])) { - services_dnsmasq_configure(); + services_dnsmasq_configure(false); } - if (isset($config['unbound']['enable'])) { - services_unbound_configure(); + services_unbound_configure(false); } + + /* reload dhcpd (interface enabled/disabled status may have changed) */ + services_dhcpd_configure(); } return 0; @@ -3536,14 +3536,15 @@ function interface_track6_configure($interface = "lan", $wancfg, $linkupevent = require_once("services.inc"); } + /* restart dns servers (defering dhcpd reload) */ if (isset($config['unbound']['enable'])) { - services_unbound_configure(); + services_unbound_configure(false); } - if (isset($config['dnsmasq']['enable'])) { - services_dnsmasq_configure(); + services_dnsmasq_configure(false); } + /* reconfigure dhcpdv6 (leaving dhcpdv4 alone) */ services_dhcpd_configure("inet6"); } |
