summaryrefslogtreecommitdiffstats
path: root/etc/rc.newwanip
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2011-06-28 20:47:57 +0000
committerErmal <eri@pfsense.org>2011-06-28 20:47:57 +0000
commitdfa766ffcc924e8d7d2869a8619f0941dd3298d1 (patch)
tree11cee4de37e2ec3efb718422ec1d8294a1c21320 /etc/rc.newwanip
parent48484aacb7613581b17faf92f6a6543546cc0a56 (diff)
downloadpfsense-dfa766ffcc924e8d7d2869a8619f0941dd3298d1.zip
pfsense-dfa766ffcc924e8d7d2869a8619f0941dd3298d1.tar.gz
Put resolvconf generation first since gif tunnels can use hostanmes
Diffstat (limited to 'etc/rc.newwanip')
-rwxr-xr-xetc/rc.newwanip12
1 files changed, 6 insertions, 6 deletions
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);
OpenPOWER on IntegriCloud