diff options
Diffstat (limited to 'debian/init')
| -rw-r--r-- | debian/init | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/debian/init b/debian/init index d084c568..ea4f0acf 100644 --- a/debian/init +++ b/debian/init @@ -1,7 +1,7 @@ #!/bin/sh ### BEGIN INIT INFO # Provides: ec2-init -# Required-Start: $network $local_fs +# Required-Start: $network $local_fs $ssh # Required-Stop: # Should-Start: $named # Should-Stop: @@ -16,10 +16,14 @@ NAME=ec2-init . /lib/lsb/init-functions +if [ ! -d /var/run/ec2 ]; then + mkdir /var/run/ec2 +fi + case "$1" in start) - log_daemon_msg "Running EC2 user data" - if ec2-run-user-data 2> /dev/null + log_daemon_msg "Setting EC2 defaults" + if ec2-set-defaults 2> /dev/null then log_end_msg 0 else @@ -34,16 +38,29 @@ case "$1" in log_end_msg 1 fi - if pgrep nash-hotplug > /dev/null + log_daemon_msg "Running EC2 user data" + if ec2-run-user-data 2>&1 | logger -t "user-data" then - log_daemon_msg "Killing nash-hotplug" - if pkill nash-hotplug; - then - log_end_msg 0 - else - log_end_msg 1 - fi + 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 + log_end_msg 0 + else + log_end_msg 1 + fi + log_daemon_msg "Determining EC2 availability zone" + if ec2-set-apt-sources 2> /dev/null + then + log_end_msg 0 + else + log_end_msg 1 + fi + ;; stop) exit 0 |