diff options
| author | Seth Mos <seth.mos@xs4all.nl> | 2008-12-17 09:43:42 +0000 |
|---|---|---|
| committer | Seth Mos <seth.mos@xs4all.nl> | 2008-12-17 09:43:42 +0000 |
| commit | 509b056881584f821ed7d476b677fd8d8da4fa03 (patch) | |
| tree | 63b116a7ada5d052397ef5aad5c2350eb64fa5a5 /etc/inc/config.inc | |
| parent | f83dee7006fd8aaf4e86b4cee0664dc6443cdaab (diff) | |
| download | pfsense-509b056881584f821ed7d476b677fd8d8da4fa03.zip pfsense-509b056881584f821ed7d476b677fd8d8da4fa03.tar.gz | |
remove stderr redirect
Diffstat (limited to 'etc/inc/config.inc')
| -rw-r--r-- | etc/inc/config.inc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 4ccc3bf..7cf3a84 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -2074,7 +2074,7 @@ endif; rsort($databases); foreach($databases as $database) { log_error("Upgrading rrd database {$rrddbpath}{$database}"); - mwexec("$rrdtool tune {$rrddbpath}{$database} -r roundtrip:delay 2>&1"); + mwexec("$rrdtool tune {$rrddbpath}{$database} -r roundtrip:delay "); } /* let apinger recreate required files */ setup_gateways_monitor(); @@ -2085,14 +2085,13 @@ endif; foreach($databases as $database) { log_error("Upgrading rrd database {$rrddbpath}{$database}"); /* rename DS source */ - mwexec("$rrdtool tune {$rrddbpath}{$database} -r in:inpass 2>&1"); - mwexec("$rrdtool tune {$rrddbpath}{$database} -r out:outpass 2>&1"); + mwexec("$rrdtool tune {$rrddbpath}{$database} -r in:inpass "); + mwexec("$rrdtool tune {$rrddbpath}{$database} -r out:outpass "); /* dump contents to xml and move database out of the way */ mwexec("$rrdtool dump {$rrddbpath}{$database} > {$g['tmp_path']}/{$database}.xml"); - mwexec("mv {$rrddbpath}{$database} {$g['tmp_path']}/$databases.backup 2>&1"); + mwexec("mv {$rrddbpath}{$database} {$g['tmp_path']}/{$database}.backup"); /* let enable_rrd_graphing recreate the database and restore the contents */ - enable_rrd_graphing(); - mwexec("$rrdtool restore {$g['tmp_path']}/{$database}.xml {$rrddbpath}{$database} 2>&1"); + mwexec("$rrdtool restore {$g['tmp_path']}/{$database}.xml {$rrddbpath}{$database} "); } /* build a list of packets databases */ @@ -2101,14 +2100,13 @@ endif; foreach($databases as $database) { log_error("Upgrading rrd database {$rrddbpath}{$database}"); /* rename DS source */ - mwexec("$rrdtool tune {$rrddbpath}{$database} -r in:inpass 2>&1"); - mwexec("$rrdtool tune {$rrddbpath}{$database} -r out:outpass 2>&1"); + mwexec("$rrdtool tune {$rrddbpath}{$database} -r in:inpass "); + mwexec("$rrdtool tune {$rrddbpath}{$database} -r out:outpass "); /* dump contents to xml and move database out of the way */ mwexec("$rrdtool dump {$rrddbpath}{$database} > {$g['tmp_path']}/{$database}.xml"); - mwexec("mv {$rrddbpath}{$database} {$g['tmp_path']}/$databases.backup 2>&1"); + mwexec("mv {$rrddbpath}{$database} {$g['tmp_path']}/$databases.backup "); /* let enable_rrd_graphing recreate the database and restore the contents */ - enable_rrd_graphing(); - mwexec("$rrdtool restore {$g['tmp_path']}/{$database}.xml {$rrddbpath}{$database} 2>&1"); + mwexec("$rrdtool restore {$g['tmp_path']}/{$database}.xml {$rrddbpath}{$database} "); } $config['version'] = "5.5"; } |
