kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-22 09:50:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[set localtime]: Update locale group tasks

Browse source 
Convert the locale group tasks frmom a simple list to a function. This
now matches the other non-simple task groups.

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

28
bootstrapvz/common/task_groups.py
View file

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