Permalink
Browse files

Small changes.

  • Loading branch information...
1 parent 9f33702 commit d0dd92644c47e432389e5d5e8f2465d762b8a48f @dagwieers committed Oct 28, 2004
Showing with 18 additions and 4 deletions.
  1. +1 −1 ChangeLog
  2. +17 −3 dstat
View
@@ -8,7 +8,7 @@
- Added --vmstat option, vmstat alike output
- Implemented a basic network, interrupt and disk 'discovery' function
- Replaced hardcoded 4096 by resource.getpagesize()
-- Added enumerate() for python < 2.3
+- Added enumerate() for python < 2.3, and rewrote/removed it again
- Check for support of proc filesystem and entries
- Fixes for kernel 2.4 support (disk and paging)
- Titles are now truncated to max-1
View
20 dstat
@@ -1,8 +1,22 @@
#!/usr/bin/python
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as published by
+# the Free Software Foundation; version 2 only
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Copyright 2004 Dag Wieers <dag@wieers.com>
from __future__ import generators
-import os, sys, glob, re, shutil, getopt, popen2
-import ConfigParser, urlparse, time, signal, resource
+import os, sys, re, getopt
+import ConfigParser, urlparse, signal, resource
VERSION = "0.4"
@@ -458,7 +472,7 @@ class dstat_net(dstat):
retlist = []
for line in open('/proc/net/dev', 'r').readlines():
iface = line.split()[0].split(':')[0]
- if iface in ('eth0', 'eth1', 'eth2', 'wifi0', 'bond0'):
+ if iface in ('bond0', 'bond1', 'eth0', 'eth1', 'eth2', 'wifi0'):
retlist.append(iface)
if len(retlist) > 2: retlist = retlist[0:2]
retlist.sort()

0 comments on commit d0dd926

Please sign in to comment.