=== modified file 'debian/eucalyptus-common.eucalyptus.upstart'
--- debian/eucalyptus-common.eucalyptus.upstart	2010-01-06 00:15:37 +0000
+++ debian/eucalyptus-common.eucalyptus.upstart	2010-01-08 05:35:43 +0000
@@ -64,6 +64,15 @@
 		opts="$opts --disable-ebs"
 	fi
 
-	[ -n "$services" ] || { stop; exit 0; }
-	exec eucalyptus-cloud $opts
+	# Start the appropriate service(s)
+	if [ -n "$services" ]; then
+		# Cloud services to run
+		exec eucalyptus-cloud $opts
+	elif [ -r "/etc/init/eucalyptus-nc.conf" ]; then
+		# Node services to run
+		exec sleep 999999999d   # Dummy event, to trigger starting eucalyptus-nc
+	else
+		stop
+		exit 0
+	fi
 end script

=== modified file 'debian/eucalyptus-nc.upstart'
--- debian/eucalyptus-nc.upstart	2010-01-07 14:43:47 +0000
+++ debian/eucalyptus-nc.upstart	2010-01-08 05:36:09 +0000
@@ -1,8 +1,8 @@
 description "Eucalyptus node controller"
 author "Dustin Kirkland <kirkland@canonical.com>"
 
-start on started libvirt-bin
-stop on runlevel [!2345]
+start on (started libvirt-bin and started eucalyptus)
+stop on (stopping libvirt-bin or stopping eucalyptus)
 
 respawn