diff options
author | Renato Botelho <renato@netgate.com> | 2015-09-30 14:33:29 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-09-30 14:33:37 -0300 |
commit | 2344bed478676b498a014dcec618db37e3422fd1 (patch) | |
tree | f278a4652a311ce1935d40e626ec4310b45737b6 /src/etc/inc/rrd.inc | |
parent | c580e34c6fe24107817d6a72956e77b23f043beb (diff) | |
download | pfsense-2344bed478676b498a014dcec618db37e3422fd1.zip pfsense-2344bed478676b498a014dcec618db37e3422fd1.tar.gz |
Use product_name global variable in more places
Diffstat (limited to 'src/etc/inc/rrd.inc')
-rw-r--r-- | src/etc/inc/rrd.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/inc/rrd.inc b/src/etc/inc/rrd.inc index 86148d6..8d4f194 100644 --- a/src/etc/inc/rrd.inc +++ b/src/etc/inc/rrd.inc @@ -55,7 +55,7 @@ function restore_rrd() { $rrdrestore = ""; $rrdreturn = ""; - if (file_exists("{$g['cf_conf_path']}/rrd.tgz") && (isset($config['system']['use_mfs_tmpvar']) || $g['platform'] != "pfSense")) { + if (file_exists("{$g['cf_conf_path']}/rrd.tgz") && (isset($config['system']['use_mfs_tmpvar']) || $g['platform'] != $g['product_name'])) { foreach (glob("{$rrddbpath}/*.xml") as $xml_file) { @unlink($xml_file); } @@ -87,7 +87,7 @@ function restore_rrd() { unset($rrdrestore); @unlink("{$g['tmp_path']}/rrd_restore"); /* If this backup is still there on a full install, but we aren't going to use ram disks, remove the archive since this is a transition. */ - if (($g['platform'] == "pfSense") && !isset($config['system']['use_mfs_tmpvar'])) { + if (($g['platform'] == $g['product_name']) && !isset($config['system']['use_mfs_tmpvar'])) { unlink_if_exists("{$g['cf_conf_path']}/rrd.tgz"); } return true; |