summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-05-21 08:26:57 -0700
committerSage Weil <sage@inktank.com>2013-05-21 08:26:57 -0700
commitbbcbab448b6735d471fa3f6d8e11882e0e57959d (patch)
tree1ea5f88295c856f2efc1f0bbbd091b3840b27f48 /debian
parent150e1706ccdf092cf74daeabcf721da087f8ca99 (diff)
parent1c7b9c35053d26b556a247297da127ff0d6aa07d (diff)
downloadceph-bbcbab448b6735d471fa3f6d8e11882e0e57959d.tar.gz
Merge branch 'next'
Conflicts: debian/ceph.prerm
Diffstat (limited to 'debian')
-rw-r--r--debian/ceph.prerm7
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/ceph.prerm b/debian/ceph.prerm
index 17f8bcc3097..ad509223cbc 100644
--- a/debian/ceph.prerm
+++ b/debian/ceph.prerm
@@ -12,6 +12,13 @@ invoke-rc.d ceph-all stop || {
fi
}
+invoke-rc.d ceph stop || {
+ RESULT=$?
+ if [ $RESULT != 100 ]; then
+ exit $RESULT
+ fi
+}
+
#DEBHELPER#
exit 0