Export value for infinite disk quota.

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

diff --git a/python/vserver.py b/python/vserver.py
index 139a953..f455e60 100644 (file)
--- a/python/vserver.py
+++ b/python/vserver.py
@@ -17,6 +17,7 @@ import vserverimpl, vduimpl
 import cpulimit, bwlimit
 
 from vserverimpl import VS_SCHED_CPU_GUARANTEED as SCHED_CPU_GUARANTEED
+from vserverimpl import DLIMIT_INF
 
 
 
@@ -43,7 +44,7 @@ class VServer:
     INITSCRIPTS = [('/etc/rc.vinit', 'start'),
                    ('/etc/rc.d/rc', '%(runlevel)d')]
 
-    def __init__(self, name, vm_id, vm_running = False):
+    def __init__(self, name, vm_id = None, vm_running = False):
 
         self.name = name
         self.config_file = "/etc/vservers/%s.conf" % name
@@ -59,6 +60,8 @@ class VServer:
                 if ex.errno != errno.ENOENT:
                     raise
         self.remove_caps = ~vserverimpl.CAP_SAFE;
+        if vm_id == None:
+            vm_id = int(self.config['S_CONTEXT'])
         self.ctx = vm_id
         self.vm_running = vm_running
 
@@ -219,8 +222,11 @@ class VServer:
 
     def get_bwlimit(self, dev = "eth0"):
 
+        result = bwlimit.get(self.ctx)
         # result of bwlimit.get is (ctx, share, minrate, maxrate)
-        return bwlimit.get(self.ctx)[1:]
+        if result:
+            result = result[1:]
+        return result
 
     def open(self, filename, mode = "r", bufsize = -1):