- # VServer.start calls fork() internally
- vserver.VServer.start(self)
- # Watch for 5 mins to see if slice is running before setting the name
- # It would make sense to do this as part of start in VServer, but the name
- # comes from NM. Also, the name would only change in NM. Name can only be
- # set from root context, so overloading chcontext wont work; chcontext, setname
- # will fail, and in the converse the context isn't setup in the kernel.
- for i in range(0,60):
- time.sleep(5)
- if vserver.VServer.is_running(self):
- # Set the vciVHI_CONTEXT to slice_id for
- # fprobe-ulog to mark packets with.
- logger.log("%s: Setting name to %s" % (self.name, self.slice_id),2)
- self.setname(self.slice_id)
- break
-
+ # VServer.start calls fork() internally,
+ # so just close the nonstandard fds and fork once to avoid creating zombies
+ child_pid = os.fork()
+ if child_pid == 0:
+ if self.initscriptchanged:
+ logger.log('%s: installing initscript' % self.name)
+ def install_initscript():
+ flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
+ fd = os.open('/etc/rc.vinit', flags, 0755)
+ os.write(fd, self.initscript)
+ os.close(fd)
+ try:
+ self.chroot_call(install_initscript)
+ except: logger.log_exc(self.name)
+ tools.close_nonstandard_fds()
+ vserver.VServer.start(self)
+ os._exit(0)
+ else:
+ os.waitpid(child_pid, 0)
+ self.initscriptchanged = False