mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3950 from marcelloc/patch-5

Browse Source
This commit is contained in:
Steve Beaver 2018-06-21 11:09:14 -04:00
commit fc00cb2082
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/usr/local/www/includes/functions.inc.php
View File

@ -177,7 +177,7 @@ function disk_usage($slice = '/') {
}
function swap_usage() {
exec("/usr/sbin/swapinfo", $swap_info);
exec("/usr/sbin/swapinfo | /usr/bin/tail -1", $swap_info);
$swap_used = "";
foreach ($swap_info as $line) {
if (preg_match('/(\d+)%$/', $line, $matches)) {

2
src/usr/local/www/widgets/widgets/system_information.widget.php
View File

@ -435,7 +435,7 @@ $temp_use_f = (isset($user_settings['widgets']['thermal_sensors-0']) && !empty($
<div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="<?=$swapusage?>" aria-valuemin="0" aria-valuemax="100" style="width: <?=$swapusage?>%">
</div>
</div>
<span><?=$swapusage?>% of <?= sprintf("%.0f", `/usr/sbin/swapinfo -m | /usr/bin/grep -v Device | /usr/bin/awk '{ print $2;}'`) ?> MiB</span>
<span><?=$swapusage?>% of <?= sprintf("%.0f", `/usr/sbin/swapinfo -m | /usr/bin/tail -1 | /usr/bin/awk '{ print $2;}'`) ?> MiB</span>
</td>
</tr>
<?php endif; ?>