diff options
| author | Ermal <eri@pfsense.org> | 2010-12-06 10:29:59 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2010-12-06 10:29:59 +0000 |
| commit | e53e7a5d04c916596b0d84c585d6e0bcfd9e2ba7 (patch) | |
| tree | 1a194baafcb9a20b3bdfc572e929d5475a1b878f | |
| parent | baa16005835f465637ae7a9564ae7af36a007c6d (diff) | |
| download | pfsense-e53e7a5d04c916596b0d84c585d6e0bcfd9e2ba7.zip pfsense-e53e7a5d04c916596b0d84c585d6e0bcfd9e2ba7.tar.gz | |
Do not call filter_configure here the caller does. Also remove old code of the times when check_reload_status used files as trigers.
| -rw-r--r-- | etc/inc/interfaces.inc | 3 | ||||
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 25 |
2 files changed, 1 insertions, 27 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index bda9c4c..621e894 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -2606,9 +2606,6 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven /* reload captive portal */ captiveportal_init_rules(); - - /* set the reload filter dity flag */ - filter_configure(); } } diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 3f8d545..688a65e 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -789,13 +789,6 @@ function strncpy(&$dst, $src, $length) { function reload_interfaces_sync() { global $config, $g; - /* XXX: Use locks?! */ - if (file_exists("{$g['tmp_path']}/reloading_all")) { - log_error("WARNING: Recursive call to interfaces sync!"); - return; - } - touch("{$g['tmp_path']}/reloading_all"); - if($g['debug']) log_error("reload_interfaces_sync() is starting."); @@ -812,13 +805,6 @@ function reload_interfaces_sync() { /* set up interfaces */ interfaces_configure(); - - /* remove reloading_all trigger */ - if($g['debug']) - log_error("Removing {$g['tmp_path']}/reloading_all"); - - /* start devd back up */ - mwexec("/bin/rm {$g['tmp_path']}/reload*"); } /****f* pfsense-utils/reload_all @@ -860,13 +846,6 @@ function reload_all_sync() { $g['booting'] = false; - /* XXX: Use locks?! */ - if (file_exists("{$g['tmp_path']}/reloading_all")) { - log_error("WARNING: Recursive call to reload all sync!"); - return; - } - touch("{$g['tmp_path']}/reloading_all"); - /* parse config.xml again */ $config = parse_config(true); @@ -908,8 +887,6 @@ function reload_all_sync() { /* restart webConfigurator if needed */ send_event("service restart webgui"); - - mwexec("/bin/rm {$g['tmp_path']}/reload*"); } function auto_login() { @@ -2118,4 +2095,4 @@ function filter_rules_compare($a, $b) { return compare_interface_friendly_names($a['interface'], $b['interface']); } -?>
\ No newline at end of file +?> |
