summaryrefslogtreecommitdiff
path: root/cloudinit/sources
diff options
context:
space:
mode:
authorBen Howard <ben.howard@canonical.com>2014-01-24 12:52:04 -0700
committerBen Howard <ben.howard@canonical.com>2014-01-24 12:52:04 -0700
commit7079fac4646380db1e064a433d7843473bda1542 (patch)
treecb7a4307e0b2929a4b07e99769579d04c89ca123 /cloudinit/sources
parentfb55c1079375454d2a2a2f82c6c1812759eeb1f1 (diff)
downloadvyos-cloud-init-7079fac4646380db1e064a433d7843473bda1542.tar.gz
vyos-cloud-init-7079fac4646380db1e064a433d7843473bda1542.zip
Fixed flip-flopped comment
Diffstat (limited to 'cloudinit/sources')
-rw-r--r--cloudinit/sources/DataSourceSmartOS.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/cloudinit/sources/DataSourceSmartOS.py b/cloudinit/sources/DataSourceSmartOS.py
index 6bd4a5c7..73dd2ba0 100644
--- a/cloudinit/sources/DataSourceSmartOS.py
+++ b/cloudinit/sources/DataSourceSmartOS.py
@@ -159,21 +159,21 @@ class DataSourceSmartOS(sources.DataSource):
smartos_noun, strip = attribute
md[ci_noun] = self.query(smartos_noun, strip=strip)
- # @datadictionary: This key has no defined format, but its value
- # is written to the file /var/db/mdata-user-data on each boot prior
- # to the phase that runs user-script. This file is not to be executed.
- # This allows a configuration file of some kind to be injected into
- # the machine to be consumed by the user-script when it runs.
+ # @datadictionary: This key may contain a program that is written
+ # to a file in the filesystem of the guest on each boot and then
+ # executed. It may be of any format that would be considered
+ # executable in the guest instance.
u_script = md.get('user-script')
u_script_f = "%s/99_user_script" % self.user_script_d
u_script_l = "%s/user-script" % LEGACY_USER_D
util.write_content(u_script, u_script_f, link=u_script_l,
executable=True)
- # @datadictionary: This key may contain a program that is written
- # to a file in the filesystem of the guest on each boot and then
- # executed. It may be of any format that would be considered
- # executable in the guest instance.
+ # @datadictionary: This key has no defined format, but its value
+ # is written to the file /var/db/mdata-user-data on each boot prior
+ # to the phase that runs user-script. This file is not to be executed.
+ # This allows a configuration file of some kind to be injected into
+ # the machine to be consumed by the user-script when it runs.
u_data = md.get('legacy-user-data')
u_data_f = "%s/mdata-user-data" % LEGACY_USER_D
util.write_content(u_data, u_data_f)