added in a 'setup' boolean argument to indicate that set_resources is being called...

diff --git a/python/vserver.py b/python/vserver.py
index 69e150c..577a44a 100644 (file)
--- a/python/vserver.py
+++ b/python/vserver.py
@@ -369,7 +369,7 @@ class VServer:
             state_file.close()
 
         if vserverimpl.chcontext(self.ctx, vserverimpl.text2bcaps(self.get_capabilities_config())):
             state_file.close()
 
         if vserverimpl.chcontext(self.ctx, vserverimpl.text2bcaps(self.get_capabilities_config())):

-            self.set_resources()
+            self.set_resources(True)

             vserverimpl.setup_done(self.ctx)
 
     def __prep(self, runlevel):
             vserverimpl.setup_done(self.ctx)
 
     def __prep(self, runlevel):


@@ -472,7 +472,7 @@ class VServer:
                 self.log(traceback.format_exc())
             os._exit(0)
 
                 self.log(traceback.format_exc())
             os._exit(0)
 

-    def set_resources(self):
+    def set_resources(self,setup=False):

 
         """ Called when vserver context is entered for first time,
         should be overridden by subclass. """
 
         """ Called when vserver context is entered for first time,
         should be overridden by subclass. """