summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2010-06-18 10:51:22 -0400
committerScott Moser <smoser@ubuntu.com>2010-06-18 10:51:22 -0400
commitda22979dabb6a5d791eaca17aae8c15fd39cdafe (patch)
treef24707bcc3ebc7eb028d03f2de09f1a641427574
parentdf7da118d0fff58d4eb3832ded30aefd87bf3594 (diff)
downloadvyos-cloud-init-da22979dabb6a5d791eaca17aae8c15fd39cdafe.tar.gz
vyos-cloud-init-da22979dabb6a5d791eaca17aae8c15fd39cdafe.zip
prefix config 'sem' entries with semaphores with 'config-'
Previously, most of the config semaphores were prefixed with 'config-'. Ie, a sem/ list would look like: apt-update-upgrade.i-7c908817 config-misc.i-7c908817 config-mounts.i-7c908817 config-puppet.i-7c908817 config-ssh.i-7c908817 consume_userdata.i-7c908817 disable-ec2-metadata.always set_defaults.i-7c908817 set_hostname.i-7c908817 With the last release (0.5.11), those config- would have been removed. I'll handle this correctly yuckyness in the ubuntu package upgrade (avoiding re-running scripts that were already ran)
-rw-r--r--cloudinit/CloudConfig/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/CloudConfig/__init__.py b/cloudinit/CloudConfig/__init__.py
index 600b21ab..2d96b06b 100644
--- a/cloudinit/CloudConfig/__init__.py
+++ b/cloudinit/CloudConfig/__init__.py
@@ -49,7 +49,7 @@ class CloudConfig():
if not freq:
freq = def_freq
- self.cloud.sem_and_run(name, freq, handler,
+ self.cloud.sem_and_run("config-" + name, freq, handler,
[ name, self.cfg, self.cloud, cloudinit.log, args ])
except:
cloudinit.log.error(traceback.format_exc())