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-final | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 mode change 100755 => 100644 sysvinit/debian/cloud-final

(limited to 'sysvinit/debian/cloud-final')

diff --git a/sysvinit/debian/cloud-final b/sysvinit/debian/cloud-final
old mode 100755
new mode 100644
index 46e9b454..55afc8b0
--- a/sysvinit/debian/cloud-final
+++ b/sysvinit/debian/cloud-final
@@ -13,6 +13,7 @@
 
 # Authors: Julien Danjou <acid@debian.org>
 #          Juerg Haefliger <juerg.haefliger@hp.com>
+#          Thomas Goirand <zigo@debian.org>
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Cloud service"
@@ -32,6 +33,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