From: Steve Muir <smuir@cs.princeton.edu>
Date: Tue, 14 Mar 2006 15:16:06 +0000 (+0000)
Subject: Read default VM id from config file
X-Git-Tag: after-util-vserver-0_30_208-revert~35
X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=commitdiff_plain;h=373a84dab7ad64878aa06f9deb7f2908c423d5c8

Read default VM id from config file
---

diff --git a/python/vserver.py b/python/vserver.py
index 139a953..a3a1563 100644
--- a/python/vserver.py
+++ b/python/vserver.py
@@ -43,7 +43,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 +59,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