git://git.onelab.eu
/
util-vserver-pl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Back out of always creating network namespace when starting vserver
[util-vserver-pl.git]
/
python
/
vserver.py
diff --git
a/python/vserver.py
b/python/vserver.py
index
59141aa
..
ed83670
100644
(file)
--- a/
python/vserver.py
+++ b/
python/vserver.py
@@
-380,12
+380,8
@@
class VServer:
else:
# child process
try:
else:
# child process
try:
- f = "/etc/vservers/%s/spaces/net" % self.name
- # Always start vserver with a network namespace.
- subprocess.call(["/bin/touch", f], shell=False)
subprocess.call("/usr/sbin/vserver %s start" % self.name,
shell=True)
subprocess.call("/usr/sbin/vserver %s start" % self.name,
shell=True)
- #subprocess.call(["/bin/rm", f], shell=False)
# we get here due to an exception in the top-level child process
except Exception, ex:
self.log(traceback.format_exc())
# we get here due to an exception in the top-level child process
except Exception, ex:
self.log(traceback.format_exc())