[Pkg-ceph-commits] [ceph] 01/02: * d/{ceph|ceph-mds|radosgw}.{postinst|prerm}: Check to ensure that system is running upstart before trying to start/stop upstart configurations (Closes: #734241, #738845, #738845).

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch master
in repository ceph.

commit d56becb0accef707c5fe8cd932bf77376c925d92
Author: James Page <james.page at ubuntu.com>
Date:   Wed Mar 5 16:49:47 2014 +0000

    * d/{ceph|ceph-mds|radosgw}.{postinst|prerm}: Check to ensure that system
      is running upstart before trying to start/stop upstart configurations
      (Closes: #734241, #738845, #738845).
    
    Conflicts:
    	debian/changelog
---
 debian/ceph-mds.postinst | 14 ++++++++------
 debian/ceph-mds.prerm    | 14 ++++++++------
 debian/ceph.postinst     | 14 ++++++++------
 debian/ceph.prerm        | 14 ++++++++------
 debian/changelog         |  3 +++
 debian/radosgw.postinst  | 14 ++++++++------
 debian/radosgw.prerm     | 14 ++++++++------
 7 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/debian/ceph-mds.postinst b/debian/ceph-mds.postinst
index d606b03..5001fa9 100644
--- a/debian/ceph-mds.postinst
+++ b/debian/ceph-mds.postinst
@@ -21,12 +21,14 @@ set -e
 
 case "$1" in
 	configure)
-		invoke-rc.d ceph-mds-all start || {
-			RESULT=$?
-			if [ $RESULT != 100 ]; then
-				exit $RESULT
-			fi
-		}
+		if [ -x /sbin/start ]; then
+			invoke-rc.d ceph-mds-all start || {
+				RESULT=$?
+				if [ $RESULT != 100 ]; then
+					exit $RESULT
+				fi
+			}
+		fi
 	;;
 	abort-upgrade|abort-remove|abort-deconfigure)
 		:
diff --git a/debian/ceph-mds.prerm b/debian/ceph-mds.prerm
index 858e592..e952a3f 100644
--- a/debian/ceph-mds.prerm
+++ b/debian/ceph-mds.prerm
@@ -5,12 +5,14 @@ set -e
 
 case "$1" in
 	remove)
-		invoke-rc.d ceph-mds-all stop || {
-			RESULT=$?
-			if [ $RESULT != 100 ]; then
-				exit $RESULT
-			fi
-		}
+		if [ -x /sbin/stop ]; then
+			invoke-rc.d ceph-mds-all stop || {
+				RESULT=$?
+				if [ $RESULT != 100 ]; then
+					exit $RESULT
+				fi
+			}
+		fi
 		invoke-rc.d ceph stop mds || {
 			RESULT=$?
 			if [ $RESULT != 100 ]; then
diff --git a/debian/ceph.postinst b/debian/ceph.postinst
index 2aef10b..8292e64 100644
--- a/debian/ceph.postinst
+++ b/debian/ceph.postinst
@@ -28,12 +28,14 @@ set -e
 case "$1" in
 	configure)
 		rm -f /etc/init/ceph.conf
-		invoke-rc.d ceph-all start || {
-			RESULT=$?
-			if [ $RESULT != 100 ]; then
-				exit $RESULT
-			fi
-		}
+		if [ -x /sbin/start ]; then
+			invoke-rc.d ceph-all start || {
+				RESULT=$?
+				if [ $RESULT != 100 ]; then
+					exit $RESULT
+				fi
+			}
+		fi
 	;;
 	abort-upgrade|abort-remove|abort-deconfigure)
 		:
diff --git a/debian/ceph.prerm b/debian/ceph.prerm
index 57015fa..be7f715 100644
--- a/debian/ceph.prerm
+++ b/debian/ceph.prerm
@@ -5,12 +5,14 @@ set -e
 
 case "$1" in
 	remove)
-		invoke-rc.d ceph-all stop || {
-			RESULT=$?
-			if [ $RESULT != 100 ]; then
-				exit $RESULT
-			fi
-		}
+		if [ -x /sbin/stop ]; then
+			invoke-rc.d ceph-all stop || {
+				RESULT=$?
+				if [ $RESULT != 100 ]; then
+					exit $RESULT
+				fi
+			}
+		fi
 		invoke-rc.d ceph stop || {
 			RESULT=$?
 			if [ $RESULT != 100 ]; then
diff --git a/debian/changelog b/debian/changelog
index d14409d..9f5378b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ ceph (0.72.2-2) UNRELEASED; urgency=medium
 
   * d/radosgw.{postinst,postrm,preinst}: Handle renaming of radosgw
     upstart configuration on upgrade at 0.72.1-3.
+  * d/{ceph|ceph-mds|radosgw}.{postinst|prerm}: Check to ensure that system
+    is running upstart before trying to start/stop upstart configurations
+    (Closes: #734241, #738845, #738845).
 
  -- James Page <james.page at ubuntu.com>  Tue, 14 Jan 2014 14:49:35 +0000
 
diff --git a/debian/radosgw.postinst b/debian/radosgw.postinst
index 790572e..ec8d86a 100644
--- a/debian/radosgw.postinst
+++ b/debian/radosgw.postinst
@@ -27,12 +27,14 @@ set -e
 
 case "$1" in
     configure)
-        invoke-rc.d radosgw-all start || {
-            RESULT=$?
-            if [ $RESULT != 100 ]; then
-                exit $RESULT
-            fi
-        }
+	if [ -x /sbin/start ]; then
+	        invoke-rc.d radosgw-all start || {
+	            RESULT=$?
+	            if [ $RESULT != 100 ]; then
+	                exit $RESULT
+        	    fi
+	        }
+	fi
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
 	:
diff --git a/debian/radosgw.prerm b/debian/radosgw.prerm
index a4a40c1..baae241 100644
--- a/debian/radosgw.prerm
+++ b/debian/radosgw.prerm
@@ -5,12 +5,14 @@ set -e
 
 case "$1" in
     remove)
-	invoke-rc.d radosgw-all stop || {
-            RESULT=$?
-            if [ $RESULT != 100 ]; then
-                exit $RESULT
-            fi
-        }
+	if [ -x /sbin/stop ]; then
+		invoke-rc.d radosgw-all stop || {
+	            RESULT=$?
+	            if [ $RESULT != 100 ]; then
+        	        exit $RESULT
+	            fi
+	        }
+	fi
 	invoke-rc.d radosgw stop || {
 	    RESULT=$?
 	    if [ $RESULT != 100 ]; then

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-ceph/ceph.git