[svn] r4922 - trunk/tools/dstat

[packagers at lists.rpmforge.net]

Author: dag
Date: 2006-11-21 20:47:27 +0100 (Tue, 21 Nov 2006)
New Revision: 4922

Modified:
   trunk/tools/dstat/ChangeLog
   trunk/tools/dstat/dstat
Log:
Do not return md and dm devices during disk discovery

Modified: trunk/tools/dstat/ChangeLog
===================================================================
--- trunk/tools/dstat/ChangeLog	2006-11-21 19:38:06 UTC (rev 4921)
+++ trunk/tools/dstat/ChangeLog	2006-11-21 19:47:27 UTC (rev 4922)
@@ -3,6 +3,7 @@
 - Added external plugin dstat_vz for openvz cpu statistics
 - Removed the underscoring of the counter titles
 - Added underlining for the counter titles
+- Do not return md and dm devices during disk discovery
 
 * 0.6.3 - Amsterdam - released 26/06/2006
 - Changed default (silver) color of delimiter to gray

Modified: trunk/tools/dstat/dstat
===================================================================
--- trunk/tools/dstat/dstat	2006-11-21 19:38:06 UTC (rev 4921)
+++ trunk/tools/dstat/dstat	2006-11-21 19:47:27 UTC (rev 4922)
@@ -567,6 +567,7 @@
 				if len(l) < 13: continue
 				if l[3:] == ['0',] * 11: continue
 				name = l[2]
+				if re.match('(md[0-9]+|dm-[0-9]+)', name): continue
 				ret.append(name)
 		for item in list: ret.append(item)
 		return ret
@@ -631,6 +632,7 @@
 			l = line.split()
 			if len(l) < 15 or l[0] == 'major' or int(l[1]) % 16 != 0: continue
 			name = l[3]
+			if re.match('(md[0-9]+|dm-[0-9]+)', name): continue
 			ret.append(name)	
 		for item in list: ret.append(item)
 		return ret
@@ -700,6 +702,7 @@
 				l = m.groups()
 				if len(l) < 4: continue
 				name = dev(int(l[0]), int(l[1]))
+				if re.match('(md[0-9]+)', name): continue
 				ret.append(name)
 			break
 		for item in list: ret.append(item)