[Python-apps-commits] r9899 - in packages/cloud-init/trunk/debian (6 files)

[zigo at users.alioth.debian.org]

    Date: Monday, July 22, 2013 @ 11:57:25
  Author: zigo
Revision: 9899

Check if upstart is init in all init scripts (Closes: #712985)

Modified:
  packages/cloud-init/trunk/debian/changelog
  packages/cloud-init/trunk/debian/cloud-init.cloud-config.init
  packages/cloud-init/trunk/debian/cloud-init.cloud-final.init
  packages/cloud-init/trunk/debian/cloud-init.cloud-init-local.init
  packages/cloud-init/trunk/debian/cloud-init.init
  packages/cloud-init/trunk/debian/control

Modified: packages/cloud-init/trunk/debian/changelog
===================================================================
--- packages/cloud-init/trunk/debian/changelog	2013-07-22 11:48:10 UTC (rev 9898)
+++ packages/cloud-init/trunk/debian/changelog	2013-07-22 11:57:25 UTC (rev 9899)
@@ -25,6 +25,8 @@
     - init --local (cloud-init-local)
   * Reads the currently set value in /etc/cloud/cloud.cfg.d/90_dpkg.cfg to
     db_set the value of cloud-init/datasources (Closes: #709773).
+  * Check if upstart is init in all init scripts (Closes: #712985). Thanks to
+    Dmitrijs Ledkovs for reporting and his patch in the BTS.
 
  -- Thomas Goirand <zigo at debian.org>  Tue, 09 Jul 2013 23:10:34 +0800
 

Modified: packages/cloud-init/trunk/debian/cloud-init.cloud-config.init
===================================================================
--- packages/cloud-init/trunk/debian/cloud-init.cloud-config.init	2013-07-22 11:48:10 UTC (rev 9898)
+++ packages/cloud-init/trunk/debian/cloud-init.cloud-config.init	2013-07-22 11:57:25 UTC (rev 9899)
@@ -11,6 +11,7 @@
 
 # Authors: Julien Danjou <acid at debian.org>
 #          Juerg Haefliger <juerg.haefliger at hp.com>
+#          Thomas Goirand <zigo at debian.org>
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Cloud service"
@@ -30,6 +31,17 @@
 # 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"

Modified: packages/cloud-init/trunk/debian/cloud-init.cloud-final.init
===================================================================
--- packages/cloud-init/trunk/debian/cloud-init.cloud-final.init	2013-07-22 11:48:10 UTC (rev 9898)
+++ packages/cloud-init/trunk/debian/cloud-init.cloud-final.init	2013-07-22 11:57:25 UTC (rev 9899)
@@ -13,6 +13,7 @@
 
 # Authors: Julien Danjou <acid at debian.org>
 #          Juerg Haefliger <juerg.haefliger at hp.com>
+#          Thomas Goirand <zigo at debian.org>
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Cloud service"
@@ -32,6 +33,17 @@
 # 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"

Modified: packages/cloud-init/trunk/debian/cloud-init.cloud-init-local.init
===================================================================
--- packages/cloud-init/trunk/debian/cloud-init.cloud-init-local.init	2013-07-22 11:48:10 UTC (rev 9898)
+++ packages/cloud-init/trunk/debian/cloud-init.cloud-init-local.init	2013-07-22 11:57:25 UTC (rev 9899)
@@ -30,6 +30,17 @@
 # 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"

Modified: packages/cloud-init/trunk/debian/cloud-init.init
===================================================================
--- packages/cloud-init/trunk/debian/cloud-init.init	2013-07-22 11:48:10 UTC (rev 9898)
+++ packages/cloud-init/trunk/debian/cloud-init.init	2013-07-22 11:57:25 UTC (rev 9899)
@@ -10,7 +10,8 @@
 # Description:       Cloud configuration initialization
 ### END INIT INFO
 
-# Author: Julien Danjou <acid at debian.org>
+# Authors: Julien Danjou <acid at debian.org>
+#          Thomas Goirand <zigo at debian.org>
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Cloud service"
@@ -30,6 +31,17 @@
 # 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"

Modified: packages/cloud-init/trunk/debian/control
===================================================================
--- packages/cloud-init/trunk/debian/control	2013-07-22 11:48:10 UTC (rev 9898)
+++ packages/cloud-init/trunk/debian/control	2013-07-22 11:57:25 UTC (rev 9899)
@@ -27,7 +27,7 @@
 
 Package: cloud-init
 Architecture: all
-Depends: lsb-base,
+Depends: lsb-base (>= 4.1+Debian3),
          ifupdown,
          procps,
          python,