Merge from head. Resolves #20611.

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index e2e77f8..27b8663 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -58,6 +58,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             logger.log_call('/usr/sbin/vuseradd', '-t', vref, name)
         else:
             logger.log_call('/usr/sbin/vuseradd', name)
+        open('/vservers/%s/etc/slicename' % name, 'w').write(name)
 
     @staticmethod
     def destroy(name): logger.log_call('/usr/sbin/vuserdel', name)
@@ -83,7 +84,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         accounts.Account.configure(self, rec)  # install ssh keys
 
     def start(self, delay=0):
-        if self.rspec['enabled']:
+        if self.rspec['enabled'] > 0:
             logger.log('%s: starting in %d seconds' % (self.name, delay))
             time.sleep(delay)
             child_pid = os.fork()