diff options
author | Seth Mos <seth.mos@xs4all.nl> | 2009-06-06 02:45:15 +0200 |
---|---|---|
committer | Seth Mos <seth.mos@xs4all.nl> | 2009-06-06 02:45:15 +0200 |
commit | a87afa7cb85608cd5e341a25a7311d9132e8ce33 (patch) | |
tree | 0ee56bf8177f18ef140d20dc19af4c13bb2e858d /etc/inc | |
parent | 347c58b353161cf8e7a25dbd4f37dddd54670513 (diff) | |
download | pfsense-a87afa7cb85608cd5e341a25a7311d9132e8ce33.zip pfsense-a87afa7cb85608cd5e341a25a7311d9132e8ce33.tar.gz |
Revert mwexec back to exec. They are very different functions.
mwexec() has a mute flag which can be true or false, exec, returns a
array in the 2nd argument and the return code in the 3rd.
We require the output from the command.
Diffstat (limited to 'etc/inc')
-rw-r--r-- | etc/inc/upgrade_config.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index a3ea728..8fd43b0 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -1560,7 +1560,7 @@ function upgrade_054_to_055() { } /* the roundtrip times need to be divided by 1000 to get seconds, really */ $databases = array(); - mwexec("cd $rrddbpath;/usr/bin/find *-quality.rrd", $databases); + exec("cd $rrddbpath;/usr/bin/find *-quality.rrd", $databases); rsort($databases); foreach($databases as $database) { $xmldump = "{$database}.old.xml"; @@ -1595,7 +1595,7 @@ function upgrade_054_to_055() { /* build a list of traffic and packets databases */ $databases = array(); - mwexec("cd $rrddbpath;/usr/bin/find *-traffic.rrd *-packets.rrd", $databases); + exec("cd $rrddbpath;/usr/bin/find *-traffic.rrd *-packets.rrd", $databases); rsort($databases); foreach($databases as $database) { $databasetmp = "{$database}.tmp"; |