self.rspec = {}
self.initscript = ''
self.disk_usage_initialized = False
+ self.initscriptchanged = False
self.configure(rec)
@staticmethod
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()
hard = self.rspec['%s_hard'%type]
self.set_rlimit_config(limit, hard, soft, minimum)
- self.set_WHITELISTED_config(self.rspec['whitelist'])
+ self.set_capabilities_config(self.rspec['capabilities'])
+ if self.rspec['capabilities']:
+ logger.log('%s: setting capabilities to %s' % (self.name, self.rspec['capabilities']))
if False: # this code was commented out before
# N.B. net_*_rate are in kbps because of XML-RPC maxint
cpu_min = self.rspec['cpu_min']
cpu_share = self.rspec['cpu_share']
- if self.rspec['enabled'] > 0 and self.rspec['whitelist'] == 1:
+ if self.rspec['enabled'] > 0:
if cpu_min >= 50: # at least 5%: keep people from shooting themselves in the foot
logger.log('%s: setting cpu share to %d%% guaranteed' % (self.name, cpu_min/10.0))
self.set_sched_config(cpu_min, vserver.SCHED_CPU_GUARANTEED)
logger.log('%s: setting cpu share to %d' % (self.name, cpu_share))
self.set_sched_config(cpu_share, 0)
+ if self.rspec['ip_addresses'] != '0.0.0.0':
+ logger.log('%s: setting IP address(es) to %s' % (self.name, self.rspec['ip_addresses']))
+ self.set_ipaddresses_config(self.rspec['ip_addresses'])
+
if False: # Does not work properly yet.
if self.have_limits_changed():
logger.log('%s: limits have changed --- restarting' % self.name)