summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2009-07-09 00:10:01 -0400
committerScott Ullrich <sullrich@pfsense.org>2009-07-09 00:10:01 -0400
commitc14aeb0ee8e1117e77c09760771ccdf0002821e6 (patch)
tree1200a4bddf4b60be0167942f2b93ea34fe1129e5 /etc
parent9a2febd23abe4605b25ce32ba0c673a62cabe31c (diff)
downloadpfsense-c14aeb0ee8e1117e77c09760771ccdf0002821e6.zip
pfsense-c14aeb0ee8e1117e77c09760771ccdf0002821e6.tar.gz
Move upgrade wall message to the correct function (migrate_rrd_format())
Diffstat (limited to 'etc')
-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 ecd2db2..78f42c6 100644
--- a/etc/inc/rrd.inc
+++ b/etc/inc/rrd.inc
@@ -46,7 +46,6 @@ function dump_rrd_to_xml($rrddatabase, $xmldumpfile) {
function create_new_rrd($rrdcreatecmd) {
$rrdcreateoutput = array();
$rrdcreatereturn = 0;
- exec("echo 'Converting RRD configuration to new format. This might take a bit...' | wall");
exec("$rrdcreatecmd 2>&1", $rrdcreateoutput, $rrdcreatereturn);
if ($rrdcreatereturn <> 0) {
$rrdcreateoutput = implode(" ", $rrdcreateoutput);
@@ -56,6 +55,7 @@ function create_new_rrd($rrdcreatecmd) {
}
function migrate_rrd_format($rrdoldxml, $rrdnewxml) {
+ exec("echo 'Converting RRD configuration to new format. This might take a bit...' | wall");
$numrraold = count($rrdoldxml['rra']);
$numdsold = count($rrdoldxml['ds']);
$numrranew = count($rrdnewxml['rra']);
OpenPOWER on IntegriCloud