64 lines
2.3 KiB
Text
64 lines
2.3 KiB
Text
--- pydf.orig 2009-11-10 00:38:15.000000000 +0100
|
|
+++ pydf 2009-11-10 02:13:13.000000000 +0100
|
|
@@ -1,4 +1,4 @@
|
|
-#! /usr/bin/python
|
|
+#! %%PYTHON_CMD%%
|
|
|
|
import sys, os, string, types, commands, struct
|
|
from optparse import OptionParser
|
|
@@ -169,7 +169,7 @@
|
|
#end of default definitions
|
|
|
|
# read configuration file
|
|
-for conffile in ["/etc/pydfrc", os.environ['HOME']+"/.pydfrc"]:
|
|
+for conffile in ["%%PREFIX%/etc/pydfrc", os.environ['HOME']+"/.pydfrc"]:
|
|
if os.path.isfile(conffile):
|
|
execfile(conffile)
|
|
|
|
@@ -294,11 +294,12 @@
|
|
continue
|
|
device, on = line.split(' on ', 1)
|
|
device = device.split()[0]
|
|
- onparts = on.split()
|
|
+ onparts = on.rstrip(")").split(" (")
|
|
on = onparts[0]
|
|
- # option format: (a,b,..)
|
|
- opts = onparts[-1][1:-1].split(",")
|
|
- r[on] = (device, '', opts)
|
|
+ # option format: (fstype, a, b, ..)
|
|
+ typ, opts = onparts[1].split(", ", 1)
|
|
+ opts = opts.split(", ")
|
|
+ r[on] = (device, typ, opts)
|
|
|
|
if r:
|
|
return r
|
|
@@ -335,9 +336,9 @@
|
|
except (OSError, IOError):
|
|
status = 10*[0]
|
|
|
|
- fs_blocksize = status[F_BSIZE]
|
|
+ fs_blocksize = status[F_FRSIZE]
|
|
if fs_blocksize == 0:
|
|
- fs_blocksize = status[F_FRSIZE]
|
|
+ fs_blocksize = status[F_BSIZE]
|
|
free = status[F_BFREE]
|
|
size = status[F_BLOCKS]
|
|
avail = status[F_BAVAIL]
|
|
@@ -366,7 +367,7 @@
|
|
used_f = myformat(used, sizeformat, fs_blocksize)
|
|
avail_f = myformat(avail, sizeformat, fs_blocksize)
|
|
try:
|
|
- perc = round(100.*used/size, 1)
|
|
+ perc = round(100.*used/(avail+used), 1)
|
|
perc_f = str(perc)
|
|
except ZeroDivisionError:
|
|
perc = 0
|
|
@@ -435,7 +436,7 @@
|
|
"test if fs (as type) is a special one"
|
|
"in addition, a filesystem is special if it has number of blocks equal to 0"
|
|
fs = fs.lower()
|
|
- return fs in [ "tmpfs", "devpts", "proc", "sysfs", "usbfs" ]
|
|
+ return fs in [ "tmpfs", "devpts", "proc", "sysfs", "usbfs", "procfs", "devfs", "linprocfs" ]
|
|
|
|
def get_table(mps):
|
|
"table is a list of rows"
|