kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 15:36:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #281 from srivasta/master

Browse source 
[set localtime]: Set /etc/localtime by either copying or symlinking
This commit is contained in:
Anders Ingemann 2016-02-12 08:25:59 +01:00
commit b681ae8c0e
2 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bootstrapvz/common/task_groups.py
View file

@ -33,7 +33,7 @@ def get_standard_groups(manifest):
group.extend(get_network_group(manifest)) group.extend(get_network_group(manifest))
group.extend(get_apt_group(manifest)) group.extend(get_apt_group(manifest))
group.extend(security_group) group.extend(security_group)
group.extend(locale_group) group.extend(get_locale_group(manifest))
group.extend(get_bootloader_group(manifest)) group.extend(get_bootloader_group(manifest))
group.extend(cleanup_group) group.extend(cleanup_group)
return group return group
@ -133,10 +133,19 @@ def get_apt_group(manifest):
security_group = [security.EnableShadowConfig] security_group = [security.EnableShadowConfig]
locale_group = [locale.LocaleBootstrapPackage,
def get_locale_group(manifest):
from bootstrapvz.common.releases import jessie
group = [
locale.LocaleBootstrapPackage,
locale.GenerateLocale, locale.GenerateLocale,
locale.SetTimezone, locale.SetTimezone,
] ]
if manifest.release > jessie:
group.append(locale.SetLocalTimeLink)
else:
group.append(locale.SetLocalTimeCopy)
return group
def get_bootloader_group(manifest): def get_bootloader_group(manifest):

23
bootstrapvz/common/tasks/locale.py
View file

@ -43,11 +43,32 @@ class SetTimezone(Task):
@classmethod @classmethod
def run(cls, info): def run(cls, info):
from shutil import copy
tz_path = os.path.join(info.root, 'etc/timezone') tz_path = os.path.join(info.root, 'etc/timezone')
timezone = info.manifest.system['timezone'] timezone = info.manifest.system['timezone']
with open(tz_path, 'w') as tz_file: with open(tz_path, 'w') as tz_file:
tz_file.write(timezone) tz_file.write(timezone)
class SetLocalTimeLink(Task):
description = 'Setting the selected local timezone (link)'
phase = phases.system_modification
@classmethod
def run(cls, info):
timezone = info.manifest.system['timezone']
localtime_path = os.path.join(info.root, 'etc/localtime')
os.unlink(localtime_path)
os.symlink(os.path.join('/usr/share/zoneinfo', timezone), localtime_path)
class SetLocalTimeCopy(Task):
description = 'Setting the selected local timezone (copy)'
phase = phases.system_modification
@classmethod
def run(cls, info):
from shutil import copy
timezone = info.manifest.system['timezone']
zoneinfo_path = os.path.join(info.root, '/usr/share/zoneinfo', timezone) zoneinfo_path = os.path.join(info.root, '/usr/share/zoneinfo', timezone)
localtime_path = os.path.join(info.root, 'etc/localtime') localtime_path = os.path.join(info.root, 'etc/localtime')
copy(zoneinfo_path, localtime_path) copy(zoneinfo_path, localtime_path)