summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2015-04-08 18:45:37 -0500
committerChris Buechler <cmb@pfsense.org>2015-04-08 18:47:15 -0500
commit7c0c6355807c3dd864f39086e9fbe2b6a6330805 (patch)
tree39a5709c3fd49fe9d606959365cbfc26fed757ec
parentbc09b90a93d7131abe36c6c079cf5d5f27e96bf4 (diff)
downloadpfsense-7c0c6355807c3dd864f39086e9fbe2b6a6330805.zip
pfsense-7c0c6355807c3dd864f39086e9fbe2b6a6330805.tar.gz
Only restore rrd.tgz where platform is appropriate, or RAM disk being
used, otherwise you're restoring a probably old backup file. Ticket #4531
-rw-r--r--etc/inc/rrd.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/rrd.inc b/etc/inc/rrd.inc
index 5aaff68..716dd98 100644
--- a/etc/inc/rrd.inc
+++ b/etc/inc/rrd.inc
@@ -55,7 +55,7 @@ function restore_rrd() {
$rrdrestore = "";
$rrdreturn = "";
- if (file_exists("{$g['cf_conf_path']}/rrd.tgz")) {
+ if (file_exists("{$g['cf_conf_path']}/rrd.tgz") && (isset($config['system']['use_mfs_tmpvar']) || $g['platform'] != "pfSense")) {
foreach (glob("{$rrddbpath}/*.xml") as $xml_file) {
@unlink($xml_file);
}
OpenPOWER on IntegriCloud