X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=8ab08bcc77624aa5bc08e6bb9b32d6c35a6d8b29;hb=348210edf1eb5326e6a8a1e3cf9da35848de455f;hp=2bc49d6e2a05a3d21797b76449627ddc3d8762c0;hpb=05b94d1896361e2c2d5fa93c690505cda8b552cf;p=nodemanager.git

diff --git a/sliver_vs.py b/sliver_vs.py
index 2bc49d6..8ab08bc 100644
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -155,16 +155,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         new_initscript = rec['initscript']
         if new_initscript != self.initscript:
             self.initscript = new_initscript
-            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, new_initscript)
-                os.close(fd)
-            try:
-                self.chroot_call(install_initscript)
-                self.initscriptchanged = True
-            except: logger.log_exc(self.name)
+            self.initscriptchanged = True
 
         accounts.Account.configure(self, rec)  # install ssh keys
 
@@ -172,29 +163,43 @@ 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:
-                # VServer.start calls fork() internally, 
-                # so just close the nonstandard fds and fork once to avoid creating zombies
+                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)
+            else: 
+                os.waitpid(child_pid, 0)
+                self.initscriptchanged = False
         else: logger.log('%s: not starting, is not enabled' % self.name)
-        self.initscriptchanged = False
 
     def stop(self):
         logger.log('%s: stopping' % self.name)
         vserver.VServer.stop(self)
 
+    def is_running(self): 
+        return vserver.VServer.is_running(self)
+
     def set_resources(self):
         disk_max = self.rspec['disk_max']
         logger.log('%s: setting max disk usage to %d KiB' % (self.name, disk_max))
         try:  # if the sliver is over quota, .set_disk_limit will throw an exception
             if not self.disk_usage_initialized:
                 self.vm_running = False
-                logger.log('%s: computing disk usage: beginning' % self.name)
                 Sliver_VS._init_disk_info_sem.acquire()
+                logger.log('%s: computing disk usage: beginning' % self.name)
                 try: self.init_disk_info()
                 finally: Sliver_VS._init_disk_info_sem.release()
                 logger.log('%s: computing disk usage: ended' % self.name)