* debian/init: Run update-motd regardless whether its a firstboot or not.

  * debian/init: Fix comments (LP: #373057)
  * debian/control: Add update-motd as a depends.
  * ec2-set-defaults.py: Wait for network to become available. (LP: #308530)

3 files changed, 15 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index ea7c4b79..d5a5f851 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ec2-init (0.3.4ubuntu4) karmic; urgency=low
+
+  * debian/init: Run update-motd regardless whether its a firstboot or not.
+  * debian/init: Fix comments (LP: #373057)
+  * debian/control: Add update-motd as a depends.
+  * ec2-set-defaults.py: Wait for network to become available. (LP: #308530)
+
+ -- Chuck Short <zulcss@ubuntu.com>  Thu, 28 May 2009 05:04:31 -0400
+
 ec2-init (0.3.4ubuntu3) karmic; urgency=low
 
   * debian/init: Move init script to run before ssh and regenerate the ssh
diff --git a/debian/control b/debian/control
index e51482e0..a2812cae 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.8.0
 
 Package: ec2-init
 Architecture: i386 amd64
-Depends: python, procps, python-configobj, python-cheetah, python-apt
+Depends: python, procps, python-configobj, python-cheetah, python-apt, update-motd
 Description: Init scripts for EC2 instances,
  EC2 instances need special scripts to run during initialisation
  to retrieve and install ssh keys and to let the user run various scripts.
diff --git a/debian/init b/debian/init
index 3f982be5..0f0c3767 100644
--- a/debian/init
+++ b/debian/init
@@ -16,7 +16,7 @@ NAME=ec2-init
 
 . /lib/lsb/init-functions
 
-if [ ! -d /var/run/ec2 ]; then
+if [ ! -d /var/ec2 ]; then
 	mkdir /var/ec2
 fi
 
@@ -37,8 +37,11 @@ first_boot() {
         ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub | logger -s -t "ec2"
         echo "-----END SSH HOST KEY FINGERPRINTS-----" | logger -s -t "ec2"
         echo "#############################################################" | logger -s -t "ec2"
-        update-motd
+	/usr/sbin/update-motd
         touch /var/ec2/.first-boot
+    else
+	log_daemon_msg "Running update-motd"
+	/usr/sbin/update-motd
     fi
 }