From 05481a4fa1a30e0879c2939f0eee19c8004efe04 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Tue, 18 Feb 2014 09:17:54 -0500 Subject: [PATCH] Implemented: FS#3010 - Remove mount --bind lines from df output in monitor --- server/lib/classes/cron.d/100-monitor_disk_usage.inc.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/lib/classes/cron.d/100-monitor_disk_usage.inc.php b/server/lib/classes/cron.d/100-monitor_disk_usage.inc.php index 4f7f890..2af4041 100644 --- a/server/lib/classes/cron.d/100-monitor_disk_usage.inc.php +++ b/server/lib/classes/cron.d/100-monitor_disk_usage.inc.php @@ -73,8 +73,9 @@ //$dfData = shell_exec('df -hT 2>/dev/null'); $app->uses('getconf'); $web_config = $app->getconf->get_server_config($conf['server_id'], 'web'); - $dfData = shell_exec('df -hT|grep -v "'.$web_config['website_basedir'].'/" 2>/dev/null'); - + + $dfData = shell_exec('df -hT -x simfs | awk \'!x[$1]++\' 2>/dev/null'); + // split into array $df = explode("\n", $dfData); -- Gitblit v1.9.1