Commit d147e4b8 authored by Franco Fichtner's avatar Franco Fichtner

rc: reload_all like a christmas tree

parent 61567c81
...@@ -1569,8 +1569,8 @@ function services_dyndns_list() ...@@ -1569,8 +1569,8 @@ function services_dyndns_list()
); );
} }
function services_dyndns_configure_client($conf) { function services_dyndns_configure_client($conf)
{
if (!isset($conf['enable'])) { if (!isset($conf['enable'])) {
return; return;
} }
...@@ -1598,7 +1598,7 @@ function services_dyndns_configure_client($conf) { ...@@ -1598,7 +1598,7 @@ function services_dyndns_configure_client($conf) {
); );
} }
function services_dyndns_configure($int = '') function services_dyndns_configure($int = '', $verbose = false)
{ {
global $config; global $config;
...@@ -1606,8 +1606,9 @@ function services_dyndns_configure($int = '') ...@@ -1606,8 +1606,9 @@ function services_dyndns_configure($int = '')
$dyndnscfg = $config['dyndnses']['dyndns']; $dyndnscfg = $config['dyndnses']['dyndns'];
$gwgroups = return_gateway_groups_array(); $gwgroups = return_gateway_groups_array();
if (is_array($dyndnscfg)) { if (is_array($dyndnscfg)) {
if (file_exists("/var/run/booting")) { if ($verbose) {
echo gettext("Starting dynamic DNS clients..."); echo 'Starting dynamic DNS clients...';
flush();
} }
foreach ($dyndnscfg as $dyndns) { foreach ($dyndnscfg as $dyndns) {
...@@ -1620,8 +1621,8 @@ function services_dyndns_configure($int = '') ...@@ -1620,8 +1621,8 @@ function services_dyndns_configure($int = '')
} }
} }
if (file_exists("/var/run/booting")) { if ($verbose) {
echo gettext("done.") . "\n"; echo "done.\n";
} }
} }
} }
......
...@@ -39,26 +39,29 @@ require_once("interfaces.inc"); ...@@ -39,26 +39,29 @@ require_once("interfaces.inc");
global $config; global $config;
$config = parse_config(); $config = parse_config(true);
log_error("rc.reload_all: Reloading all configuration settings."); log_error("rc.reload_all: Reloading all configuration settings.");
system_firmware_configure(); system_firmware_configure(true);
system_login_configure(); system_login_configure(true);
system_timezone_configure(); system_timezone_configure(true);
system_hostname_configure(); system_hostname_configure(true);
system_hosts_generate(); system_hosts_generate(true);
system_resolvconf_generate(); system_resolvconf_generate(true);
services_dhcpd_configure(); services_dhcpd_configure('all', array(), true);
interfaces_configure(); interfaces_configure(true);
services_dyndns_configure(); services_dyndns_configure('', true);
system_cron_configure(); system_cron_configure(true);
mwexec_bg('/usr/local/etc/rc.sshd'); mwexec_bg('/usr/local/etc/rc.sshd');
mwexec_bg('/usr/local/etc/rc.restart_webgui'); mwexec_bg('/usr/local/etc/rc.restart_webgui');
if (function_exists('plugins_configure')) { 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."); log_error("rc.reload_all: Reloading filter configuration.");
filter_configure_sync();
filter_configure_sync(true);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment