No functional change just code reshuffle.

2 files changed, 10 insertions, 12 deletions

diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc
index 4a9decb..d5da8a8 100644
--- a/etc/inc/gwlb.inc
+++ b/etc/inc/gwlb.inc
@@ -243,11 +243,11 @@ EOD;
 	killbypid("{$g['varrun_path']}/apinger.pid");
 	if (is_dir("{$g['tmp_path']}"))
 		chmod("{$g['tmp_path']}", 01777);
-	if (!is_dir("{$g['vardb_path']}/rrd")) {
+	if (!is_dir("{$g['vardb_path']}/rrd"))
 		mkdir("{$g['vardb_path']}/rrd", 0775);
-	}
-	if (is_dir("{$g['vardb_path']}/rrd"))
-		chown("{$g['vardb_path']}/rrd", "nobody");
+
+	@chown("{$g['vardb_path']}/rrd", "nobody");
+
 	/* start a new apinger process */
 	mwexec_bg("/usr/local/sbin/apinger -c {$g['varetc_path']}/apinger.conf");
 
diff --git a/etc/rc.newwanip b/etc/rc.newwanip
index 95d44a3..a6b1bcb 100755
--- a/etc/rc.newwanip
+++ b/etc/rc.newwanip
@@ -74,9 +74,6 @@ if (file_exists("{$g['vardb_path']}/{$interface}_cacheip"))
 /* regenerate resolv.conf if DNS overrides are allowed */
 system_resolvconf_generate(true);
 
-/* perform RFC 2136 DNS update */
-services_dnsupdate_process($interface);
-
 /* write current WAN IP to file */
 file_put_contents("{$g['vardb_path']}/{$interface}_ip", $curwanip);
 file_put_contents("{$g['vardb_path']}/{$interface}_cacheip", $curwanip);
@@ -84,6 +81,9 @@ file_put_contents("{$g['vardb_path']}/{$interface}_cacheip", $curwanip);
 if (is_ipaddr($oldip) && $curwanip == $oldip)
 	exit;
 
+/* perform RFC 2136 DNS update */
+services_dnsupdate_process($interface);
+
 /* signal dyndns update */
 file_put_contents("{$g['tmp_path']}/update_dyndns", $interface);
 
@@ -100,16 +100,14 @@ filter_configure();
 /* reload graphing functions */
 enable_rrd_graphing();
 
-/* update the gateway group items gateway */
-//update_gateway_groups_defaultroute($interface);
+/* reconfigure our gateway monitor */
+setup_gateways_monitor();
+
 
 /* restart packages */
 mwexec_bg("/usr/local/sbin/ntpdate_sync_once.sh");
 mwexec_bg("/etc/rc.start_packages");
 log_error("{$g['product_name']} package system has detected an ip change $oldip ->  $curwanip ... Restarting packages.");		
 
-/* reconfigure our gateway monitor */
-setup_gateways_monitor();
-
 return 0;
 ?>