diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index 4e19d4cb5..afc986e60 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -1569,8 +1569,8 @@ function services_dyndns_list() ); } -function services_dyndns_configure_client($conf) { - +function services_dyndns_configure_client($conf) +{ if (!isset($conf['enable'])) { return; } @@ -1598,7 +1598,7 @@ function services_dyndns_configure_client($conf) { ); } -function services_dyndns_configure($int = '') +function services_dyndns_configure($int = '', $verbose = false) { global $config; @@ -1606,8 +1606,9 @@ function services_dyndns_configure($int = '') $dyndnscfg = $config['dyndnses']['dyndns']; $gwgroups = return_gateway_groups_array(); if (is_array($dyndnscfg)) { - if (file_exists("/var/run/booting")) { - echo gettext("Starting dynamic DNS clients..."); + if ($verbose) { + echo 'Starting dynamic DNS clients...'; + flush(); } foreach ($dyndnscfg as $dyndns) { @@ -1620,8 +1621,8 @@ function services_dyndns_configure($int = '') } } - if (file_exists("/var/run/booting")) { - echo gettext("done.") . "\n"; + if ($verbose) { + echo "done.\n"; } } } diff --git a/src/etc/rc.reload_all b/src/etc/rc.reload_all index 917f78f2a..15d2937ee 100755 --- a/src/etc/rc.reload_all +++ b/src/etc/rc.reload_all @@ -39,26 +39,29 @@ require_once("interfaces.inc"); global $config; -$config = parse_config(); +$config = parse_config(true); log_error("rc.reload_all: Reloading all configuration settings."); -system_firmware_configure(); -system_login_configure(); -system_timezone_configure(); -system_hostname_configure(); -system_hosts_generate(); -system_resolvconf_generate(); -services_dhcpd_configure(); -interfaces_configure(); -services_dyndns_configure(); -system_cron_configure(); +system_firmware_configure(true); +system_login_configure(true); +system_timezone_configure(true); +system_hostname_configure(true); +system_hosts_generate(true); +system_resolvconf_generate(true); +services_dhcpd_configure('all', array(), true); +interfaces_configure(true); +services_dyndns_configure('', true); +system_cron_configure(true); + mwexec_bg('/usr/local/etc/rc.sshd'); mwexec_bg('/usr/local/etc/rc.restart_webgui'); if (function_exists('plugins_configure')) { - plugins_configure('local'); + log_error("rc.reload_all: Reloading all plugin settings."); + plugins_configure('local', true); } log_error("rc.reload_all: Reloading filter configuration."); -filter_configure_sync(); + +filter_configure_sync(true);