X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=python%2Fvserver.py;h=8fdb50577957671b9a0795c2a64f848cc247f932;hb=88d249dcc24798a4e8a149b59a2b353038e8e631;hp=96ebcdda1f4cb5e1bde2bebb91e701a65163bcdf;hpb=9dfaea8dd87b2cadfd5472e184a766e1a0a75d52;p=util-vserver-pl.git diff --git a/python/vserver.py b/python/vserver.py index 96ebcdd..8fdb505 100644 --- a/python/vserver.py +++ b/python/vserver.py @@ -230,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 @@ -390,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"])