Merge lp:~mathiaz/eucalyptus/karmic-fix-cloud-upstart-job into lp:~ubuntu-core-dev/eucalyptus/ubuntu

[Mathias Gug]

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-15 22:05:15 +0000
+++ debian/changelog	2009-10-16 01:40:29 +0000
@@ -1,9 +1,14 @@
 eucalyptus (1.6~bzr931-0ubuntu4) UNRELEASED; urgency=low
 
+  [ Kees Cook ]
   * Fix unsafe /tmp file uses (LP: #445105):
     - tools/detach.pl: remove debugging XML dump call.
     - node/handlers_xen.c: use mkstemp().
 
+  [ Mathias Gug ]
+  * debian/eucalyptus-common.eucalyptus.upstart: Start eucalyptus-cloud
+    with all the relevant options (LP: #452665).
+
  -- Kees Cook <[e-mail]>  Thu, 15 Oct 2009 15:03:37 -0700
 
 eucalyptus (1.6~bzr931-0ubuntu3) karmic; urgency=low
 
=== modified file 'debian/eucalyptus-common.eucalyptus.upstart'
--- debian/eucalyptus-common.eucalyptus.upstart	2009-10-14 02:53:42 +0000
+++ debian/eucalyptus-common.eucalyptus.upstart	2009-10-16 01:40:29 +0000
@@ -3,9 +3,11 @@
 
 start on runlevel [23]
 
+respawn
+
 pre-start script
 	# Check if installed
-	[ -f /usr/sbin/euca_conf ]
+	[ -f /usr/sbin/euca_conf ] || { stop; exit 0; }
 
 	mkdir -p /var/run/eucalyptus/net
 	chown eucalyptus:eucalyptus /var/run/eucalyptus /var/run/eucalyptus/net
@@ -16,7 +18,9 @@
 		echo "Eucalyptus is not configured yet"
 		exit 1
 	fi
+end script
 
+script
 	. /etc/eucalyptus/eucalyptus.conf
 
 	opts="-h $EUCALYPTUS -u $EUCA_USER --pidfile /var/run/eucalyptus/eucalyptus.pid -L console-log"
@@ -52,12 +56,6 @@
 		opts="$opts --disable-ebs"
 	fi
 
-	[ -n "$services" ] || exit 0
-
-end script
-
-exec eucalyptus-cloud $opts
-
-post-stop script
-	rm -f /var/run/eucalyptus/eucalyptus.options
+	[ -n "$services" ] || { stop; exit 0; }
+	exec eucalyptus-cloud $opts
 end script