summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2010-05-22 14:19:32 -0400
committerScott Ullrich <sullrich@pfsense.org>2010-05-22 14:19:32 -0400
commita57d6170198bf46e21a178732b32982ed8b8ab62 (patch)
tree95cb62e0cf34cdef85df5cc5015ffc1d132932bc
parentf76d5242df8ff02cc15c00708f4f66b151c8e133 (diff)
downloadpfsense-a57d6170198bf46e21a178732b32982ed8b8ab62.zip
pfsense-a57d6170198bf46e21a178732b32982ed8b8ab62.tar.gz
Ensure config.cache does not exist so the subsequent requests can cleanly reload the configuration. Ticket #601
-rw-r--r--etc/inc/pfsense-utils.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 0b8317a..c30a818 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -642,6 +642,8 @@ function restore_config_section($section, $new_contents) {
if ($section_xml != -1)
$config[$section] = &$section_xml;
@unlink($g['tmp_path'] . "/tmpxml");
+ if(file_exists("{$g['tmp_path']}/config.cache"))
+ unlink("{$g['tmp_path']}/config.cache");
write_config("Restored {$section} of config file (maybe from CARP partner)");
conf_mount_ro();
return;
OpenPOWER on IntegriCloud