diff options
author | jim-p <jimp@pfsense.org> | 2011-07-01 11:38:20 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2011-07-01 11:38:20 -0400 |
commit | 2488a7e73a1527445f23b97d30cde74d1bb74738 (patch) | |
tree | fc17367994edbe8b94232b864e85942ca73ec651 /etc/rc.newwanip | |
parent | da70dc36adf11666d92ab109c564c76103a3ebac (diff) | |
parent | 0fcaf4f2723c7defa1f8cd13ac3ba63c73a9d77d (diff) | |
download | pfsense-2488a7e73a1527445f23b97d30cde74d1bb74738.zip pfsense-2488a7e73a1527445f23b97d30cde74d1bb74738.tar.gz |
Merge remote branch 'upstream/master'
Diffstat (limited to 'etc/rc.newwanip')
-rwxr-xr-x | etc/rc.newwanip | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/etc/rc.newwanip b/etc/rc.newwanip index ad3a54d..fc8c802 100755 --- a/etc/rc.newwanip +++ b/etc/rc.newwanip @@ -89,16 +89,25 @@ $oldip = "0.0.0.0"; if (file_exists("{$g['vardb_path']}/{$interface}_cacheip")) $oldip = file_get_contents("{$g['vardb_path']}/{$interface}_cacheip"); -$grouptmp = link_interface_to_group($interface); -if (!empty($grouptmp)) - array_walk($grouptmp, 'interface_group_add_member'); - /* regenerate resolv.conf if DNS overrides are allowed */ system_resolvconf_generate(true); /* write current WAN IP to file */ file_put_contents("{$g['vardb_path']}/{$interface}_ip", $curwanip); +unset($gre); +$gre = link_interface_to_gre($interface); +if (!empty($gre)) + array_walk($gre, 'interface_gre_configure'); +unset($gif); +$gif = link_interface_to_gif($interface); +if (!empty($gif)) + array_walk($gif, 'interface_gif_configure'); + +$grouptmp = link_interface_to_group($interface); +if (!empty($grouptmp)) + array_walk($grouptmp, 'interface_group_add_member'); + /* reconfigure static routes (kernel may have deleted them) */ system_routing_configure($interface); |