From 9645203e0c320a1623162124aa839f4163527d15 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 22 Jan 2010 13:29:19 -0500 Subject: only run setting of default locale and apt sources once-per-instance --- ec2-init.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ec2-init.py b/ec2-init.py index 4b4bd494..0ca01466 100755 --- a/ec2-init.py +++ b/ec2-init.py @@ -36,8 +36,8 @@ def main(): # set the defaults (like what ec2-set-defaults.py did) try: - generate_sources_list(cloud.get_mirror()) - apply_locale(cloud.get_locale()) + cloud.sem_and_run("set_defaults", "once-per-instance", + set_defaults,cloud,False) except: warn("failed to set defaults\n") @@ -61,6 +61,10 @@ def render_to_file(template, outfile, searchList): f = open(outfile, 'w') f.write(t.respond()) f.close() + +def set_defaults(cloud): + generate_sources_list(cloud.get_mirror()) + apply_locale(cloud.get_locale()) def apply_locale(locale): subprocess.Popen(['locale-gen', locale]).communicate() -- cgit v1.2.3