git://git.onelab.eu
/
util-vserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c853248
)
Read default VM id from config file
author
Steve Muir
<smuir@cs.princeton.edu>
Tue, 14 Mar 2006 15:16:06 +0000
(15:16 +0000)
committer
Steve Muir
<smuir@cs.princeton.edu>
Tue, 14 Mar 2006 15:16:06 +0000
(15:16 +0000)
python/vserver.py
patch
|
blob
|
history
diff --git
a/python/vserver.py
b/python/vserver.py
index
139a953
..
a3a1563
100644
(file)
--- 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