summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2010-07-28 17:19:16 -0400
committerjim-p <jimp@pfsense.org>2010-07-28 17:19:41 -0400
commit34834e7ef9817eca591b367fefe1a543a11cc315 (patch)
tree6ce244b638c49c05b01a75499e215582e8614fd7 /etc
parent868c6826b523c360f614dfad4498d33b49ae7c82 (diff)
downloadpfsense-34834e7ef9817eca591b367fefe1a543a11cc315.zip
pfsense-34834e7ef9817eca591b367fefe1a543a11cc315.tar.gz
Only output these messages when booting.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/upgrade_config.inc9
1 files changed, 6 insertions, 3 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 8f07a71..975716d 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -1703,7 +1703,8 @@ function upgrade_054_to_055() {
$xmldump = "{$database}.old.xml";
$xmldumpnew = "{$database}.new.xml";
- echo "Migrate RRD database {$database} to new format \n";
+ if ($g['booting'])
+ echo "Migrate RRD database {$database} to new format \n";
mwexec("$rrdtool tune {$rrddbpath}{$database} -r roundtrip:delay 2>&1");
dump_rrd_to_xml("{$rrddbpath}/{$database}", "{$g['tmp_path']}/{$xmldump}");
@@ -1740,7 +1741,8 @@ function upgrade_054_to_055() {
$xmldumptmp = "{$database}.tmp.xml";
$xmldumpnew = "{$database}.new.xml";
- echo "Migrate RRD database {$database} to new format \n";
+ if ($g['booting'])
+ echo "Migrate RRD database {$database} to new format \n";
/* rename DS source */
mwexec("$rrdtool tune {$rrddbpath}/{$database} -r in:inpass 2>&1");
mwexec("$rrdtool tune {$rrddbpath}/{$database} -r out:outpass 2>71");
@@ -1787,7 +1789,8 @@ function upgrade_054_to_055() {
}
enable_rrd_graphing();
- echo "Updating configuration...";
+ if ($g['booting'])
+ echo "Updating configuration...";
}
OpenPOWER on IntegriCloud