diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-04-08 18:45:37 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-04-08 18:45:37 -0500 |
| commit | 05b7eef94f28fc73dcd07faa322e8d569f6938ea (patch) | |
| tree | 1e8699731003e205ed36201e441019b3fce356ff /etc | |
| parent | fe29fe04d37254092e13a729505416a10092b157 (diff) | |
| download | pfsense-05b7eef94f28fc73dcd07faa322e8d569f6938ea.zip pfsense-05b7eef94f28fc73dcd07faa322e8d569f6938ea.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
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/rrd.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/rrd.inc b/etc/inc/rrd.inc index c620419..0e3dfd6 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); } @@ -980,4 +980,4 @@ function kill_traffic_collector() { killbypid("{$g['varrun_path']}/updaterrd.sh.pid"); } -?> +?>
\ No newline at end of file |
