diff options
| author | Chuck Short <zulcss@ubuntu.com> | 2009-05-13 14:41:35 +0200 |
|---|---|---|
| committer | Chuck Short <zulcss@ubuntu.com> | 2009-05-13 14:41:35 +0200 |
| commit | dd112c3afe50c75ae9b00f142b550c6e0d95f47b (patch) | |
| tree | ce1843820c13f3c33dd16d34929deedf16107f37 /debian | |
| parent | 322bf4c779a378f113e6bf60714c66298aba876d (diff) | |
| download | vyos-cloud-init-dd112c3afe50c75ae9b00f142b550c6e0d95f47b.tar.gz vyos-cloud-init-dd112c3afe50c75ae9b00f142b550c6e0d95f47b.zip | |
* Really change the locale when setting up an instance. (LP: #341066)
* Run ec2-run-user-data script last. (LP: #373055)
* Minor comment tweaks. (LP:373057)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/init | 21 |
2 files changed, 18 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index a99b17fc..a705faaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ec2-init (0.3.4ubuntu2) karmic; urgency=low + + * Really change the locale when setting up an instance. (LP: #341066) + * Run ec2-run-user-data script last. (LP: #373055) + * Minor comment tweaks. (LP:373057) + + -- Chuck Short <zulcss@ubuntu.com> Wed, 13 May 2009 13:41:35 -0400 + ec2-init (0.3.4ubuntu1) karmic; urgency=low * Add more smarts to ec2 instance bring up. (LP: #371936) diff --git a/debian/init b/debian/init index ea4f0acf..15345b6a 100644 --- a/debian/init +++ b/debian/init @@ -30,7 +30,7 @@ case "$1" in log_end_msg 1 fi - log_daemon_msg "Fetching EC2 login credentials" + log_daemon_msg "Fetching EC2 SSH keys" if ec2-fetch-credentials 2> /dev/null then log_end_msg 0 @@ -38,28 +38,27 @@ case "$1" in log_end_msg 1 fi - log_daemon_msg "Running EC2 user data" - if ec2-run-user-data 2>&1 | logger -t "user-data" - then - log_end_msg 0 - else - log_end_msg 1 - fi - - log_daemon_msg "Setting hostname to EC2 public_hostname" + log_daemon_msg "Setting hostname to EC2 localhostname" if ec2-set-hostname 2> /dev/null then log_end_msg 0 else log_end_msg 1 fi - log_daemon_msg "Determining EC2 availability zone" + log_daemon_msg "Creating /etc/apt/sources.list" if ec2-set-apt-sources 2> /dev/null then log_end_msg 0 else log_end_msg 1 fi + log_daemon_msg "Running EC2 user data" + if ec2-run-user-data 2>&1 | logger -t "user-data" + then + log_end_msg 0 + else + log_end_msg 1 + fi ;; stop) |