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

[set localtime]: Set /etc/localtime by either copying or symlinking

Browse source 
Starting in version 2016a-1 (circa Jan 2016) the package tzdata
changed /etc/timezone into a symlink. This change is in unstable,
testing, and will be in the next release (stretch). This commit checks
the release, and creates a task to either copy the contents of the
zoneinfo file (jessie and older) or create a symbolic link (newer than
jessie).

Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>
This commit is contained in:
Manoj Srivastava 2016-02-10 13:47:12 -08:00
parent a6e4b40268
commit b20ce793a4
No known key found for this signature in database
GPG key ID: 36BD720F6F576472
2 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bootstrapvz/common/task_groups.py
View file

@ -33,7 +33,16 @@ 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)
from bootstrapvz.common.releases import jessie
if manifest.release > jessie:
if not locale.SetLocalTimeLink in locale_group:
locale_group.extend(locale.SetLocalTimeLink)
else:
if not locale.SetLocalTimeCopy in locale_group:
locale_group.extend(locale.SetLocalTimeCopy)
group.extend(locale_group) group.extend(locale_group)
group.extend(get_bootloader_group(manifest)) group.extend(get_bootloader_group(manifest))
group.extend(cleanup_group) group.extend(cleanup_group)
return group return group

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)