From dd112c3afe50c75ae9b00f142b550c6e0d95f47b Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Wed, 13 May 2009 14:41:35 +0200 Subject: * 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) --- debian/init | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'debian/init') 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) -- cgit v1.2.3