Fixes for non-eth0 devices

[util-vserver-pl.git] / python / bwlimit.py

diff --git a/python/bwlimit.py b/python/bwlimit.py
index b6ef291..ab760b5 100644 (file)
--- a/python/bwlimit.py
+++ b/python/bwlimit.py
@@ -50,7 +50,6 @@
 #
 
 import sys, os, re, getopt
-from sets import Set
 import pwd
 
 
@@ -524,7 +523,7 @@ def on(xid, dev = dev, share = None, minrate = None, maxrate = None, minexemptra
             maxexemptrate = cap[5]
 
     # Figure out what the current node bandwidth cap is
-    bwcap = get_bwcap()
+    bwcap = get_bwcap(dev)
 
     # Set defaults
     if share is None:
@@ -662,7 +661,7 @@ def main():
 
     # Defaults
     numeric = False
-    bwcap = get_bwcap()
+    bwcap = None
 
     (opts, argv) = getopt.getopt(sys.argv[1:], "d:nr:q:vh")
     for (opt, optval) in opts:
@@ -679,6 +678,12 @@ def main():
         elif opt == '-h':
             usage()
 
+    if not bwcap:
+        bwcap = get_bwcap(dev)
+
+    if bwcap == -1:
+        return 0
+
     if len(argv):
         if argv[0] == "init" or (argv[0] == "on" and len(argv) == 1):
             # (Re)initialize