From 6dddf16cb8dea2e1a96b3d613b81087df247fd3d Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Mon, 6 Apr 2009 23:04:48 +0100 Subject: * ec2-set-hostname.py: - Use template for /etc/hosts creation. - Dont use public_hostname in /etc/hosts. (LP: #352745) * debian/control: - Add python-cheetah as a depends. * templates/sources.list.tmpl: - Update template. * debian/init: - Run the ec2-user-data script last so that the users get a stable system before running the user scripts. --- debian/init | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'debian/init') diff --git a/debian/init b/debian/init index ea4f0acf..113d8700 100644 --- a/debian/init +++ b/debian/init @@ -38,14 +38,6 @@ 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" if ec2-set-hostname 2> /dev/null then @@ -61,6 +53,14 @@ 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 + ;; stop) exit 0 -- cgit v1.2.3