Create resolv.conf whenever a new ip comes in to have it ready for vpn reloads. Also restart packages in background.

1 files changed, 8 insertions, 9 deletions

diff --git a/etc/rc.newwanip b/etc/rc.newwanip
index fee8104..a0b8423 100755
--- a/etc/rc.newwanip
+++ b/etc/rc.newwanip
@@ -64,15 +64,8 @@ if($curwanip == "0.0.0.0") {
         exit;
 }
 
-/* reconfigure IPsec tunnels */
-vpn_ipsec_force_reload();
-
-/* start OpenVPN server & clients */
-exec("killall -HUP openvpn 2>/dev/null");
-
 /* regenerate resolv.conf if DNS overrides are allowed */
-if (isset($config['system']['dnsallowoverride'])) 
-    system_resolvconf_generate(true);
+system_resolvconf_generate(true);
 
 /* perform RFC 2136 DNS update */
 services_dnsupdate_process($interface);
@@ -83,6 +76,12 @@ file_put_contents("{$g['vardb_path']}/{$interface}_ip", $curwanip);
 /* signal dyndns update */
 file_put_contents("/tmp/update_dyndns", $interface);
 
+/* reconfigure IPsec tunnels */
+vpn_ipsec_force_reload();
+
+/* start OpenVPN server & clients */
+exec("killall -HUP openvpn 2>/dev/null");
+
 /* signal filter reload */
 unlink_if_exists("/tmp/config.cache");
 filter_configure();
@@ -95,7 +94,7 @@ update_gateway_groups_defaultroute($interface);
 
 /* restart packages */
 mwexec_bg("/usr/local/sbin/ntpdate_sync_once.sh");
-exec("/etc/rc.start_packages");
+mwexec_bg("/etc/rc.start_packages");
 log_error("{$g['product_name']} package system has detected an ip change $old_ip ->  $curwanip ... Restarting packages.");		
 
 /* reconfigure our gateway monitor */