X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=8ab08bcc77624aa5bc08e6bb9b32d6c35a6d8b29;hb=6147df8093bc97e6f571bbae326c1fc994c5390f;hp=ee0b5d498876f31ba05c2718d0df304833ccf16a;hpb=54d24023edce344ad1790c3bf89e93817c3c98e6;p=nodemanager.git

diff --git a/sliver_vs.py b/sliver_vs.py
index ee0b5d4..8ab08bc 100644
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -163,6 +163,8 @@ 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, 
+            # so just close the nonstandard fds and fork once to avoid creating zombies
             child_pid = os.fork()
             if child_pid == 0:
                 if self.initscriptchanged:
@@ -174,21 +176,21 @@ class Sliver_VS(accounts.Account, vserver.VServer):
                         os.close(fd)
                     try:
                         self.chroot_call(install_initscript)
-                        self.initscriptchanged = False
                     except: logger.log_exc(self.name)
-                # 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: 
+                os.waitpid(child_pid, 0)
+                self.initscriptchanged = False
         else: logger.log('%s: not starting, is not enabled' % self.name)
 
     def stop(self):
         logger.log('%s: stopping' % self.name)
         vserver.VServer.stop(self)
 
-    def is_running(self): vserver.VServer.is_running(self)
+    def is_running(self): 
+        return vserver.VServer.is_running(self)
 
     def set_resources(self):
         disk_max = self.rspec['disk_max']