X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=python%2Fvserver.py;h=a4e828d00111901cd04066e0e6e833243e077afd;hb=16d8f5d34df3c1fd2f3895fae64e1b77a5c8e6b1;hp=796b0121f494a8c4ef06696c69052c3cd0ecfd4c;hpb=8ec34cc8b506ee7bfc7754625ad7914afd2fcbae;p=util-vserver-pl.git

diff --git a/python/vserver.py b/python/vserver.py
index 796b012..a4e828d 100644
--- a/python/vserver.py
+++ b/python/vserver.py
@@ -20,6 +20,7 @@ import cpulimit, bwlimit
 
 from vserverimpl import DLIMIT_INF
 from vserverimpl import VC_LIM_KEEP
+from vserverimpl import VC_LIM_INFINITY
 from vserverimpl import VLIMIT_NSOCK
 from vserverimpl import VLIMIT_OPENFD
 from vserverimpl import VLIMIT_ANON
@@ -229,18 +230,25 @@ class VServer:
 
     def set_ipaddresses(self, addresses):
         vserverimpl.netremove(self.ctx, "all")
-        for a in addresses.split(","):
-            vserverimpl.netadd(self.ctx, a)
+        for ip in addresses:
+            vserverimpl.netadd(self.ctx, ip)
 
     def set_ipaddresses_config(self, addresses):
-        return # acb
+        ip_addresses = addresses.split(",")
+
+        # add looopback interface
+        if not ip_addresses.__contains__("127.0.0.1"):
+            ip_addresses.append("127.0.0.1")
+
         i = 0
-        for a in addresses.split(","):
-            self.config.update("interfaces/%d/ip" % i, a)
+        for ip in ip_addresses:
+            self.config.update("interfaces/%d/ip" % i, ip)
+            # create emtpy nodev files to silent "No device specified for" warnings
+            self.config.update("interfaces/%d/nodev" % i, "")
             i += 1
-        while self.config.unset("interfaces/%d/ip" % i):
+        while self.config.unset("interfaces/%d/ip" % i) and self.config.update("interfaces/%d/nodev" % i):
             i += 1
-        self.set_ipaddresses(addresses)
+        self.set_ipaddresses(ip_addresses)
 
     def get_ipaddresses_config(self):
         i = 0
@@ -389,7 +397,7 @@ class VServer:
                 os._exit(0)	# Exit parent (the first child) of the second child.
             # the grandson is the working one
             os.chdir('/')
-            os.umask(0)
+            os.umask(0022)
             try:
                 # start the vserver
                 subprocess.call(["/usr/sbin/vserver",self.name,"start"])
@@ -460,12 +468,3 @@ def create(vm_name, static = False, ctor = VServer):
     vm_id = pwd.getpwnam(vm_name)[2]
 
     return ctor(vm_name, vm_id)
-
-
-def close_nonstandard_fds():
-    """Close all open file descriptors other than 0, 1, and 2."""
-    _SC_OPEN_MAX = 4
-    for fd in range(3, os.sysconf(_SC_OPEN_MAX)):
-        try: os.close(fd)
-        except OSError: pass  # most likely an fd that isn't open
-