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

diff --git a/python/vserver.py b/python/vserver.py
index c57e281..a4e828d 100644
--- a/python/vserver.py
+++ b/python/vserver.py
@@ -243,8 +243,10 @@ class VServer:
         i = 0
         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(ip_addresses)
 
@@ -466,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
-