# When this variable is true, start after any ensure_created
startingup = False
+# Cumulative delay for starts when startingup is true
+cumstartdelay = 0
# shell path -> account class association
shell_acct_class = {}
def __init__(self, rec):
self.name = rec['name']
self.keys = ''
+ self.initscriptchanged = False
self.configure(rec)
@staticmethod
finally: self._create_sem.release()
if not isinstance(self._acct, next_class): self._acct = next_class(rec)
else: self._acct.configure(rec)
- if next_class != curr_class or startingup:
+ if startingup:
+ self._acct.start(delay=cumstartdelay)
+ cumstartdelay += 2
+ elif next_class != curr_class or self._acct.initscriptchanged:
self._acct.start()
def ensure_destroyed(self): self._q.put((self._ensure_destroyed,))
fd = os.open('/etc/rc.vinit', flags, 0755)
os.write(fd, new_initscript)
os.close(fd)
- try: self.chroot_call(install_initscript)
+ try:
+ self.chroot_call(install_initscript)
+ self.initscriptchanged = True
except: logger.log_exc()
accounts.Account.configure(self, rec) # install ssh keys
os._exit(0)
else: os.waitpid(child_pid, 0)
else: logger.log('%s: not starting, is not enabled' % self.name)
+ self.initscriptchanged = False
def stop(self):
logger.log('%s: stopping' % self.name)
finally: Sliver_VS._init_disk_info_sem.release()
logger.log('%s: computing disk usage: ended' % self.name)
self.disk_usage_initialized = True
- vserver.VServer.set_disklimit(self, disk_max)
+ vserver.VServer.set_disklimit(self, max(disk_max, self.disk_blocks))
except OSError:
logger.log('%s: failed to set max disk usage' % self.name)
logger.log_exc()