* Set the configuration file to jaunty.

* ec2-fetch-credentials: Fix typo.
* ec2-set-defaults.py: 
  - Remove timezone change when booting the instance.
  - Redirect output to /dev/null.
* ec2-set-apt-sources.py:
  - Run apt-get update after the /etc/apt/sources.list and
    redirect the output to /dev/null.
* rightscale-init: Updated rightscale-init

1 files changed, 7 insertions, 17 deletions

diff --git a/debian/ec2-init.rightscale-init.init b/debian/ec2-init.rightscale-init.init
index 4a1c52af..10ba39d3 100644
--- a/debian/ec2-init.rightscale-init.init
+++ b/debian/ec2-init.rightscale-init.init
@@ -1,16 +1,7 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:		rightscale
-# Required-Start:	
-# Required-Stop:
-# Default-Start:	2 3 4 5
-# Default-Stop:		1
-# Sort-Description:	Setup Righscale
-
+#!/bin/bash 
+#
 # This script will configure an Ubuntu server for use with RightScale
-
-set -e
+#
 
 start() {
   ## First check to see if we were launched through RightScale. Exit and remove if not...
@@ -32,7 +23,7 @@ start() {
   echo "Installing necessary packages..."
   export DEBIAN_FRONTEND=NONINTERACTIVE
   apt-get update
-  apt-get install -y binutils sysv-rc-conf unzip ruby1.8-dev autoconf automake libtool logrotate rsync openssl ca-certificates
+  apt-get install -y binutils ruby1.8 sysv-rc-conf unzip ruby1.8-dev build-essential autoconf automake libtool logrotate rsync openssl ca-certificates libopenssl-ruby1.8
 
   ## Add rightscale customizations
   echo "Installing RightScale"
@@ -90,10 +81,9 @@ stop() {
 }
 
 remove() {
-  my_name=`basename $0`
-  init_script_name=${my_name:3}
-  update-rc.d -f $init_script_name remove
-  rm -f /etc/init.d/$init_script_name
+  my_name=`readlink -e $0`
+  update-rc.d -f `basename $my_name` remove 
+  rm -f $my_name
 }