summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorSeth Mos <seth.mos@xs4all.nl>2008-12-20 10:50:57 +0000
committerSeth Mos <seth.mos@xs4all.nl>2008-12-20 10:50:57 +0000
commit9b77cde65b1826a4bc743fe55dc08c8db2c11671 (patch)
tree42b8b5e16c5b31b92e780f2adcf0c5c587e9c07f /etc
parentc5cd5ebeb947495f40639092d935bced5ebc088e (diff)
downloadpfsense-9b77cde65b1826a4bc743fe55dc08c8db2c11671.zip
pfsense-9b77cde65b1826a4bc743fe55dc08c8db2c11671.tar.gz
rename var
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/config.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index b4ebc31..e1587b7 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -2098,7 +2098,7 @@ endif;
$databasetmp = "{$database}.tmp";
$xmldump = "{$database}.old.xml";
$xmldumptmp = "{$database}.tmp.xml";
- $databasenew = "{$database}.new.xml";
+ $xmldumpnew = "{$database}.new.xml";
echo "Migrate RRD database {$rrddbpath}/{$database} to new format \n";
/* rename DS source */
@@ -2139,8 +2139,8 @@ endif;
$rrdxmlarray = migrate_rrd_format($rrdold, $rrdnew);
$rrdxml = dump_xml_config_raw($rrdxmlarray, "rrd");
- file_put_contents("{$g['tmp_path']}/{$databasenew}", $rrdxml);
- exec("$rrdtool restore -f {$g['tmp_path']}/{$databasenew} {$rrddbpath}/{$database}");
+ file_put_contents("{$g['tmp_path']}/{$xmldumpnew}", $rrdxml);
+ exec("$rrdtool restore -f {$g['tmp_path']}/{$xmldumpnew} {$rrddbpath}/{$database}");
}
enable_rrd_graphing();
$config['version'] = "5.5";
OpenPOWER on IntegriCloud