# default
default=file("/etc/planetlab/slicefamily").read().strip()
(pldistro,fcdistro,arch) = default.split("-")
+
+ known_archs = [ 'i386', 'x86_64' ]
+ known_fcdistros = [ 'f8', 'f9', 'centos5' ]
# from the slice attribute: cut dashes and try to figure the meaning
slice_wishes = vref.split("-")
for wish in slice_wishes:
- if wish == "i386" or wish == "x86_64":
+ if wish in known_archs:
arch=wish
- elif wish == "f8" or wish == "centos5" :
+ elif wish in known_fcdistros:
fcdistro=wish
else:
pldistro=wish
if self.rspec['enabled'] > 0:
logger.log('%s: starting in %d seconds' % (self.name, delay))
time.sleep(delay)
- # 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
-
+ child_pid = os.fork()
+ if child_pid == 0:
+ # VServer.start calls fork() internally,
+ # so just close the nonstandard fds and fork once to avoid creating zombies
+ tools.close_nonstandard_fds()
+ vserver.VServer.start(self)
+ os._exit(0)
+ else: os.waitpid(child_pid, 0)
else: logger.log('%s: not starting, is not enabled' % self.name)
self.initscriptchanged = False
(self.name, self.rspec['ip_addresses']))
self.set_ipaddresses_config(self.rspec['ip_addresses'])
+ if self.is_running():
+ logger.log("%s: Setting name to %s" % (self.name, self.slice_id),2)
+ self.setname(self.slice_id)
+
if False: # Does not work properly yet.
if self.have_limits_changed():
logger.log('%s: limits have changed --- restarting' % self.name)