From 068009432909ae54b42e2cb56ec6557b04c677b0 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Thu, 25 Jul 2013 16:34:19 -0400
Subject: pull in fixes for debian bug 712985

---
 sysvinit/debian/cloud-init-local | 11 +++++++++++
 1 file changed, 11 insertions(+)
 mode change 100755 => 100644 sysvinit/debian/cloud-init-local

(limited to 'sysvinit/debian/cloud-init-local')

diff --git a/sysvinit/debian/cloud-init-local b/sysvinit/debian/cloud-init-local
old mode 100755
new mode 100644
index a1685c1e..802ee8e9
--- a/sysvinit/debian/cloud-init-local
+++ b/sysvinit/debian/cloud-init-local
@@ -30,6 +30,17 @@ SCRIPTNAME=/etc/init.d/$NAME
 # and status_of_proc is working.
 . /lib/lsb/init-functions
 
+if init_is_upstart; then
+	case "$1" in
+	stop)
+		exit 0
+	;;
+	*)
+		exit 1
+	;;
+	esac
+fi
+
 case "$1" in
 start)
 	log_daemon_msg "Starting $DESC" "$NAME"
-- 
cgit v1.2.3