From: Sage Weil <sage@inktank.com>
Date: Fri, 31 May 2013 00:23:36 +0000 (-0700)
Subject: debian: guard upstart {start,stop} with -x check
X-Git-Tag: v0.64~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cf9aa7a0037e56eada8b3c1bb59d59d0bfe7bba5;p=ceph.git

debian: guard upstart {start,stop} with -x check

Sigh.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/debian/ceph-mds.postinst b/debian/ceph-mds.postinst
index a22c51697139..66b3b5fc2d71 100644
--- a/debian/ceph-mds.postinst
+++ b/debian/ceph-mds.postinst
@@ -21,7 +21,7 @@ set -e
 
 case "$1" in
     configure)
-	start ceph-mds-all || true
+	[ -x /sbin/start ] && start ceph-mds-all || :
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
 	:
diff --git a/debian/ceph-mds.prerm b/debian/ceph-mds.prerm
index 3c5f5cf142a9..654518a7d552 100644
--- a/debian/ceph-mds.prerm
+++ b/debian/ceph-mds.prerm
@@ -5,7 +5,7 @@ set -e
 
 case "$1" in
     remove)
-	stop ceph-mds-all || true
+	[ -x /sbin/stop ] && stop ceph-mds-all || :
 	invoke-rc.d ceph stop mds || {
 	    RESULT=$?
 	    if [ $RESULT != 100 ]; then
diff --git a/debian/ceph.postinst b/debian/ceph.postinst
index 98ab9b5ff727..5d64f640b994 100644
--- a/debian/ceph.postinst
+++ b/debian/ceph.postinst
@@ -28,7 +28,7 @@ set -e
 case "$1" in
     configure)
 	rm -f /etc/init/ceph.conf
-	start ceph-all || true
+	[ -x /sbin/start ] && start ceph-all || :
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
 	:
diff --git a/debian/ceph.prerm b/debian/ceph.prerm
index 074ddf62302f..bfd7d3d6fb27 100644
--- a/debian/ceph.prerm
+++ b/debian/ceph.prerm
@@ -5,7 +5,7 @@ set -e
 
 case "$1" in
     remove)
-	stop ceph-all || true
+	[ -x /sbin/stop ] && stop ceph-all || true
 	invoke-rc.d ceph stop || {
 	    RESULT=$?
 	    if [ $RESULT != 100 ]; then
diff --git a/debian/radosgw.postinst b/debian/radosgw.postinst
index afc7dd39a844..f3468bc60bf2 100644
--- a/debian/radosgw.postinst
+++ b/debian/radosgw.postinst
@@ -27,7 +27,7 @@ set -e
 
 case "$1" in
     configure)
-	start radosgw-all || true
+	[ -x /sbin/start ] && start radosgw-all || :
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
 	:
diff --git a/debian/radosgw.prerm b/debian/radosgw.prerm
index b0b0498bd894..4120fb6272c1 100644
--- a/debian/radosgw.prerm
+++ b/debian/radosgw.prerm
@@ -5,7 +5,7 @@ set -e
 
 case "$1" in
     remove)
-	stop radosgw-all || true
+	[ -x /sbin/stop ] && stop radosgw-all || true
 	invoke-rc.d radosgw stop || {
 	    RESULT=$?
 	    if [ $RESULT != 100 ]; then