this is what i really wanted to do. temporary fix. this needs to be cleaned up

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index ab9a716..bf293e0 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -106,7 +106,9 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             refname="-".join( (pldistro,fcdistro,arch) )
 
             # check the templates exists -- there's probably a better way..
-            if not os.path.isdir ("/vservers/.vref/%s"%refname):
+            if os.path.isdir ("/vservers/.vref/%s"% vref): refname = vref
+
+            if not os.path.isdir ("/vservers/.vref/%s"% refname):
                 logger.verbose("%s (%s) : vref %s not found, using default %s"%(
                         name,vref,refname,default))
                 refname=default
@@ -157,9 +159,14 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         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)
-
+            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