From 71acf0c101aac65de71c0d2b45b38e55ecbffcf2 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Tue, 19 Feb 2013 09:09:12 -0500
Subject: [PATCH] - Fixed FS#2678 - Error message whith mailman while updating ispconfg.

---
 server/lib/classes/monitor_tools.inc.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index d1ed129..68cb55d 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -135,7 +135,7 @@
 			} elseif (strstr(trim(file_get_contents('/etc/debian_version')), '7.0') || trim(file_get_contents('/etc/debian_version')) == 'wheezy/sid') {
 				$distname = 'Debian';
 				$distver = 'Wheezy/Sid';
-				$distid = 'debian70';
+				$distid = 'debian60';
 				$distbaseid = 'debian';
 			} else {
 				$distname = 'Debian';
@@ -485,7 +485,7 @@
 		$state = 'ok';
 
 		/** Fetch the data of ALL devices into a array (needed for monitoring!) */
-		$dfData = shell_exec('df -hT');
+		$dfData = shell_exec('df -hT 2>/dev/null');
 
 		// split into array
 		$df = explode("\n", $dfData);

--
Gitblit v1.9.1