=== modified file 'debian/nova-ajax-console-proxy.upstart.in'
--- debian/nova-ajax-console-proxy.upstart.in	2011-08-11 13:29:06 +0000
+++ debian/nova-ajax-console-proxy.upstart.in	2011-08-11 15:18:38 +0000
@@ -7,7 +7,15 @@
 
 chdir /var/run
 
+env DEFAULTFILE=/etc/default/nova
+
 pre-start script
+	if [ -f "$DEFAULTFILE" ]; then
+		. "$DEFAULTFILE"
+	fi
+
+	[ "x$NOVASTARTOPS" != xno ] || { stop; exit 0; }
+
 	mkdir -p /var/run/nova
 	chown nova:root /var/run/nova/
 

=== modified file 'debian/nova-api.upstart.in'
--- debian/nova-api.upstart.in	2011-08-11 13:29:06 +0000
+++ debian/nova-api.upstart.in	2011-08-11 15:18:38 +0000
@@ -7,7 +7,15 @@
 
 chdir /var/run
 
+env DEFAULTFILE=/etc/default/nova
+
 pre-start script
+	if [ -f "$DEFAULTFILE" ]; then
+		. "$DEFAULTFILE"
+	fi
+
+	[ "x$NOVASTARTOPS" != xno ] || { stop; exit 0; }
+
 	mkdir -p /var/run/nova
 	chown nova:root /var/run/nova/
 

=== modified file 'debian/nova-compute.upstart.in'
--- debian/nova-compute.upstart.in	2011-08-11 13:29:06 +0000
+++ debian/nova-compute.upstart.in	2011-08-11 15:18:38 +0000
@@ -5,9 +5,17 @@
 stop on runlevel [016]
 
 
+env DEFAULTFILE=/etc/nova/default
+
 chdir /var/run
 
 pre-start script
+	if [ -f "$DEFAULTFILE" ]; then
+		. "$DEFAULTFILE"
+	fi
+
+	 [ "x$NOVASTARTOPS" != xno ] || { stop; exit 0; }
+
 	mkdir -p /var/run/nova
 	chown nova:root /var/run/nova/
 

=== modified file 'debian/nova-network.upstart.in'
--- debian/nova-network.upstart.in	2011-08-11 13:29:06 +0000
+++ debian/nova-network.upstart.in	2011-08-11 15:18:38 +0000
@@ -4,9 +4,17 @@
 start on (filesystem and net-device-up IFACE!=lo)
 stop on runlevel [016]
 
+env DEFAULTFILE=/etc/default/nova
+
 chdir /var/run
 
 pre-start script
+	if [ -f "$DEFAULTFILE" ]; then
+		. "$DEFAULTFILE"
+	fi
+	
+	[ "x$NOVASTARTOPS" != xno ] || { stop; exit 0; }
+	
 	mkdir -p /var/run/nova
 	chown nova:root /var/run/nova/
 

=== modified file 'debian/nova-objectstore.upstart.in'
--- debian/nova-objectstore.upstart.in	2011-08-11 11:27:36 +0000
+++ debian/nova-objectstore.upstart.in	2011-08-11 15:18:38 +0000
@@ -6,7 +6,15 @@
 
 chdir /var/run
 
+env DEFAULTFILE=/etc/default/nova
+
 pre-start script
+	if [ -f "$DEFAULTFILE" ]; then
+		. "$DEFAULTFILE"
+	fi
+
+	[ "x$NOVASTARTOPS" != xno ] || { stop; exit 0; }
+
     mkdir -p /var/run/nova
     chown nova:root /var/run/nova/
 

=== modified file 'debian/nova-scheduler.upstart.in'
--- debian/nova-scheduler.upstart.in	2011-08-11 13:29:06 +0000
+++ debian/nova-scheduler.upstart.in	2011-08-11 15:18:38 +0000
@@ -7,7 +7,15 @@
 
 chdir /var/run
 
+env DEFAULTFILE=/etc/default/nova
+
 pre-start script
+	if [ -f "$DEFAULTFILE" ]; then
+		. "$DEFAULTFILE"
+	fi
+
+	[ "x$NOVASTARTOPS" != xno ] || { stop; exit 0; }
+
 	mkdir -p /var/run/nova
 	chown nova:root /var/run/nova/
 

=== modified file 'debian/nova-vncproxy.upstart.in'
--- debian/nova-vncproxy.upstart.in	2011-08-11 13:29:06 +0000
+++ debian/nova-vncproxy.upstart.in	2011-08-11 15:18:38 +0000
@@ -7,7 +7,15 @@
 
 chdir /var/run
 
+env DEFAULTFILE=/etc/default/nova
+
 pre-start script
+	if [ -f "$DEFAULTFILE" ]; then
+		. "$DEFAULTFILE"
+	fi
+
+	[ "x$NOVASTARTOPS" != xno ] || { stop; exit 0; }
+
 	mkdir -p /var/run/nova
 	chown nova:root /var/run/nova/
 

=== modified file 'debian/nova-volume.upstart.in'
--- debian/nova-volume.upstart.in	2011-08-11 13:29:06 +0000
+++ debian/nova-volume.upstart.in	2011-08-11 15:18:38 +0000
@@ -7,7 +7,15 @@
 
 chdir /var/run
 
+env DEFAULTFILE=/etc/default/nova
+
 pre-start script
+	if [ -f "$DEFAULTFILE" ]; then
+		. "$DEFAULTFILE"
+	fi
+
+	 [ "x$NOVASTARTOPS" != xno ] || { stop; exit 0; }	
+
 	mkdir -p /var/run/nova
 	chown nova:root /var/run/nova/
 end script