From 48484aacb7613581b17faf92f6a6543546cc0a56 Mon Sep 17 00:00:00 2001 From: Ermal Date: Tue, 28 Jun 2011 20:45:43 +0000 Subject: Add recovery code for gif/gre the same as in interface_configure. This helps gif/gre tunnels. Needed for capr? Suggested-by: jim-p --- etc/rc.newwanip | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'etc/rc.newwanip') diff --git a/etc/rc.newwanip b/etc/rc.newwanip index a4fbde8..d9a8601 100755 --- a/etc/rc.newwanip +++ b/etc/rc.newwanip @@ -89,6 +89,15 @@ $oldip = "0.0.0.0"; if (file_exists("{$g['vardb_path']}/{$interface}_cacheip")) $oldip = file_get_contents("{$g['vardb_path']}/{$interface}_cacheip"); +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'); -- cgit v1.1 From dfa766ffcc924e8d7d2869a8619f0941dd3298d1 Mon Sep 17 00:00:00 2001 From: Ermal Date: Tue, 28 Jun 2011 20:47:57 +0000 Subject: Put resolvconf generation first since gif tunnels can use hostanmes --- etc/rc.newwanip | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'etc/rc.newwanip') diff --git a/etc/rc.newwanip b/etc/rc.newwanip index d9a8601..0ab044e 100755 --- a/etc/rc.newwanip +++ b/etc/rc.newwanip @@ -89,6 +89,12 @@ $oldip = "0.0.0.0"; if (file_exists("{$g['vardb_path']}/{$interface}_cacheip")) $oldip = file_get_contents("{$g['vardb_path']}/{$interface}_cacheip"); +/* 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)) @@ -102,12 +108,6 @@ $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); - /* reconfigure static routes (kernel may have deleted them) */ system_routing_configure($interface); -- cgit v1.1