Move all dynamic dns update processes under the same even 'reload dyndns' since it makes sense to do so.

3 files changed, 9 insertions, 13 deletions

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index cfce316..de359f3 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -2598,10 +2598,7 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven
 			services_dnsmasq_configure();
 
 			/* update dyndns */
-			services_dyndns_configure($interface);
-
-			/* force DNS update */
-			services_dnsupdate_process($interface);
+			send_event("service reload dyndns {$interface}");
 
 			/* reload captive portal */
 			captiveportal_init_rules();
diff --git a/etc/rc.bootup b/etc/rc.bootup
index a7d3e8c..0d43103 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -293,10 +293,6 @@ echo "done.\n";
 /* Launch on bootup and keep trying to sync.  Exit once time/date has been sync'd. */
 mwexec_bg("/usr/local/sbin/ntpdate_sync_once.sh");
 
-/* static IP address? -> attempt DNS update */
-if (is_ipaddr($config['interfaces']['wan']['ipaddr']))
-	services_dnsupdate_process();
-
 /* start DHCP service */
 services_dhcpd_configure();
 
@@ -306,12 +302,12 @@ services_dnsmasq_configure();
 /* start dhcpleases dhpcp hosts leases program */
 system_dhcpleases_configure();
 
-/* start dyndns service */
-send_event("service reload dyndnsall");
-
 /* start DHCP relay */
 services_dhcrelay_configure();
 
+/* dyndns service updates */
+send_event("service reload dyndnsall");
+
 /* Run a filter configure now that most all services have started */
 filter_configure_sync();
 
diff --git a/etc/rc.dyndns.update b/etc/rc.dyndns.update
index a84cadd..557113c 100755
--- a/etc/rc.dyndns.update
+++ b/etc/rc.dyndns.update
@@ -38,9 +38,12 @@ require_once("shaper.inc");
 
 $argument = trim($argv[1], " \n");
 
-if(empty($argument))
+if(empty($argument)) {
 	services_dyndns_configure();
-else
+	services_dnsupdate_process();
+} else {
 	services_dyndns_configure($argument);
+	services_dnsupdate_process($argument);
+}
 
 ?>