diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2006-03-13 06:02:13 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2006-03-13 06:02:13 +0000 |
| commit | cfbd6db429f4a562e3f4bfdb28b7c399252e3e92 (patch) | |
| tree | 5c7cc76d7336a5d2cc8771d8b6e272db571aa55a /etc | |
| parent | 7dea83e08dd29ffa91c2bfbfc1fafe1aa8e5a97d (diff) | |
| download | pfsense-cfbd6db429f4a562e3f4bfdb28b7c399252e3e92.zip pfsense-cfbd6db429f4a562e3f4bfdb28b7c399252e3e92.tar.gz | |
* Before killing of lighty in < 65 megs of ram situation, acquire the config_lock() so that we guarantee the box will not destory config.xml
* Add same routines for RELENG_1 and HEAD
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index b3ffab8..ae3eeef 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -1353,8 +1353,10 @@ function reload_interfaces_sync() { if($avail > 0 and $avail < 66) { log_error("Not enough ram for reload. Temporarily unloading webConfigurator."); $shutdown_webgui_needed = true; + config_lock(); /* kill any running lighttpd */ killbypid("{$g['varrun_path']}/lighty-webConfigurator.pid"); + config_unlock(); } if($debug) @@ -1602,8 +1604,10 @@ function reload_all_sync() { if($avail > 0 and $avail < 66) { log_error("Not enough ram for reload. Temporarily unloading webConfigurator."); $shutdown_webgui_needed = true; + config_lock(); /* kill any running lighttpd */ killbypid("{$g['varrun_path']}/lighty-webConfigurator.pid"); + config_unlock(); } if(file_exists("{$g['tmp_path']}/config.cache")) |
