Add check to see if sliver is_running() during ensure_created. Previously, if the...

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index 9e180d1..ee0b5d4 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -170,7 +170,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
                     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.write(fd, self.initscript)
                         os.close(fd)
                     try:
                         self.chroot_call(install_initscript)
@@ -188,6 +188,8 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         logger.log('%s: stopping' % self.name)
         vserver.VServer.stop(self)
 
+    def is_running(self): 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))