Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dom0/core: add 'timezone' property support (#1 pro)

Browse Source
This commit is contained in:
Marek Marczykowski 2012-04-24 13:09:27 +02:00
parent 4ce7824fa0
commit a8ec5a6506
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom0/misc/vm-template-hvm.conf
View File

@ -18,6 +18,8 @@ device_model='stubdom-dm'
usbdevice='tablet' usbdevice='tablet'
sdl=0 sdl=0
vnc=0 vnc=0
localtime = {localtime}
rtc_timeoffset = {timeoffset}
disk = [ {rootdev} disk = [ {rootdev}
{privatedev} {privatedev}
{otherdevs} {otherdevs}

13
dom0/qvm-core/qubes.py
View File

@ -2174,6 +2174,7 @@ class QubesHVm(QubesVm):
attrs['config_file_template']['eval'] = 'config_template_hvm' attrs['config_file_template']['eval'] = 'config_template_hvm'
attrs['drive'] = { 'save': 'str(self.drive)' } attrs['drive'] = { 'save': 'str(self.drive)' }
attrs['maxmem'].pop('save') attrs['maxmem'].pop('save')
attrs['timezone'] = { 'default': 'localtime', 'save': 'str(self.timezone)' }
return attrs return attrs
@ -2205,6 +2206,7 @@ class QubesHVm(QubesVm):
attrs.remove('uses_default_kernel') attrs.remove('uses_default_kernel')
attrs.remove('kernelopts') attrs.remove('kernelopts')
attrs.remove('uses_default_kernelopts') attrs.remove('uses_default_kernelopts')
attrs += [ 'timezone' ]
return attrs return attrs
def create_on_disk(self, verbose, source_template = None): def create_on_disk(self, verbose, source_template = None):
@ -2292,6 +2294,17 @@ class QubesHVm(QubesVm):
params['otherdevs'] = "'script:file:%s,xvdc%s%s'," % (drive_path, type_mode, backend_domain) params['otherdevs'] = "'script:file:%s,xvdc%s%s'," % (drive_path, type_mode, backend_domain)
else: else:
params['otherdevs'] = '' params['otherdevs'] = ''
if self.timezone.lower() == 'localtime':
params['localtime'] = '1'
params['timeoffset'] = '0'
elif self.timezone.isdigit():
params['localtime'] = '0'
params['timeoffset'] = self.timezone
else:
print >>sys.stderr, "WARNING: invalid 'timezone' value: %s" % self.timezone
params['localtime'] = '0'
params['timeoffset'] = '0'
return params return params
def verify_files(self): def verify_files(self):