From: Andy Bavier <acb@cs.princeton.edu>
Date: Mon, 30 Nov 2009 19:30:39 +0000 (+0000)
Subject: Back out of always creating network namespace when starting vserver
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=61f3ec29fd733b9add1a2cb562db75058cfe9e27;p=util-vserver-pl.git

Back out of always creating network namespace when starting vserver
---

diff --git a/python/vserver.py b/python/vserver.py
index 59141aa..ed83670 100644
--- a/python/vserver.py
+++ b/python/vserver.py
@@ -380,12 +380,8 @@ class VServer:
         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(["/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())
diff --git a/python/vserverimpl.c b/python/vserverimpl.c
index 788535a..9d51c58 100644
--- a/python/vserverimpl.c
+++ b/python/vserverimpl.c
@@ -98,7 +98,7 @@ vserver_set_rlimit(PyObject *self, PyObject *args) {
   uint32_t bitmask;
   xid_t xid;
   int resource;
-  PyObject *ret;
+  PyObject *ret = NULL;
 
   limits.min = VC_LIM_KEEP;
   limits.soft = VC_LIM_KEEP;