diff options
| -rw-r--r-- | doc/userdata.txt | 4 | ||||
| -rwxr-xr-x | tools/make-dist-tarball | 6 | ||||
| -rw-r--r-- | upstart/cloudinit.conf | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/userdata.txt b/doc/userdata.txt index 7ada0ba5..a1873424 100644 --- a/doc/userdata.txt +++ b/doc/userdata.txt @@ -8,10 +8,10 @@ In EC2, the data is provided by the user via the '--user-data' or data available to the instance via its meta-data service at http://169.254.169.254/latest/user-data -ec2-init can read this input and act on it in different ways. +cloud-init can read this input and act on it in different ways. === Input Formats === -ec2-init will download and cache to filesystem any user-data that it +cloud-init will download and cache to filesystem any user-data that it finds. However, certain types of user-data are handled specially. * Gzip Compressed Content diff --git a/tools/make-dist-tarball b/tools/make-dist-tarball index 840fe4c0..5269c88b 100755 --- a/tools/make-dist-tarball +++ b/tools/make-dist-tarball @@ -17,9 +17,9 @@ tag=${1} tmpd=$(mktemp -d ); trap "rm -Rf '${tmpd}'" 0 -out=${topdir}/ec2-init_${tag}.orig.tar.gz +out=${topdir}/cloud-init_${tag}.orig.tar.gz cd ${tmpd} && - bzr branch "${topdir}" ./ec2-init-${tag} && - tar czf "${out}" ec2-init-${tag}/ --exclude ec2-init-${tag}/.bzr && + bzr branch "${topdir}" ./cloud-init-${tag} && + tar czf "${out}" cloud-init-${tag}/ --exclude cloud-init-${tag}/.bzr && echo "wrote ${out}" diff --git a/upstart/cloudinit.conf b/upstart/cloudinit.conf index d0f802c0..56a3545a 100644 --- a/upstart/cloudinit.conf +++ b/upstart/cloudinit.conf @@ -7,4 +7,4 @@ task console output -exec /usr/bin/ec2-init start +exec /usr/bin/cloud-init start |