summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2013-12-23 14:57:16 +0000
committerErmal <eri@pfsense.org>2013-12-23 14:57:16 +0000
commit66cc4d430accd8cf970b55fb9eb513af9601b8b6 (patch)
tree6dc1b1588840ea061ef381723a7aaae7aac920da /etc
parent0b5d55b7490e56013010cba0f1367996b5f07bb3 (diff)
downloadpfsense-66cc4d430accd8cf970b55fb9eb513af9601b8b6.zip
pfsense-66cc4d430accd8cf970b55fb9eb513af9601b8b6.tar.gz
Correct displaying states status and avoid divison by zero due to wrong data collected
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/util.inc9
1 files changed, 7 insertions, 2 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 249ea47..211610e 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -1617,8 +1617,13 @@ function set_sysctl($values) {
*/
function get_memory() {
- $physmem = trim(`sysctl -n hw.physmem`, " \n");
- $realmem = trim(`sysctl -n hw.realmem`, " \n");
+ $output = "";
+ $_gb = exec("/sbin/sysctl -n hw.physmem", $output);
+ $physmem = trim($output[0], " \n");
+ unset($output);
+ $_gb = exec("/sbin/sysctl -n hw.physmem", $output);
+ $realmem = trim($output[0], " \n");
+ unset($output, $_gb);
/* convert from bytes to megabytes */
return array(($physmem/1048576),($realmem/1048576));
}
OpenPOWER on IntegriCloud