From: Sage Weil <sage@inktank.com>
Date: Tue, 21 May 2013 15:26:57 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.64~89
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bbcbab448b6735d471fa3f6d8e11882e0e57959d;p=ceph.git

Merge branch 'next'

Conflicts:
	debian/ceph.prerm
---

bbcbab448b6735d471fa3f6d8e11882e0e57959d
diff --cc debian/ceph.prerm
index 17f8bcc30971,4aac21400a9a..ad509223cbc5
--- a/debian/ceph.prerm
+++ b/debian/ceph.prerm
@@@ -1,17 -1,6 +1,24 @@@
  #!/bin/sh
 +# vim: set noet ts=8:
  
 -[ -x /sbin/stop ] && stop ceph-all || :
 -[ -x /usr/sbin/service ] && service ceph stop || :
 +set -e
  
 -exit 0
 +invoke-rc.d ceph-all stop || {
 +	RESULT=$?
 +	# Ignore if ceph-all upstart config does not
 +	# exist or upstart is not in use
 +	if [ $RESULT != 100 ]; then
 +		exit $RESULT
 +	fi
 +}
 +
++invoke-rc.d ceph stop || {
++	RESULT=$?
++	if [ $RESULT != 100 ]; then
++		exit $RESULT
++	fi
++}
++
 +#DEBHELPER#
 +
 +exit 0