preserve /var/lib/ceph on deb/rpm purge

We should clobber configuration and log data, but *not* user data.  Leave
/var/lib/ceph alone.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index afee331428916e0d2099b0119506f60ae0929fc6..cb998c46d36b32bdf7174e4dd4e817848417bafc 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -348,15 +348,6 @@ fi
 %endif
 # Package removal cleanup
 if [ "$1" -eq "0" ] ; then
-
-    # be a little careful, here: unmount anything beneath here before removing it.
-    rm -rf --one-file-system -- /var/lib/ceph || true
-    if [ -d /var/lib/ceph ]; then
-            find /var/lib/ceph -mindepth 1 -maxdepth 2 -type d -exec umount \{\} \;
-    fi
-    rm -rf --one-file-system -- /var/lib/ceph
-
-    # Other Ceph directories
     rm -rf /var/log/ceph 
     rm -rf /etc/ceph
 fi

diff --git a/debian/ceph-mds.postrm b/debian/ceph-mds.postrm
deleted file mode 100644 (file)
index a400f72..0000000
--- a/debian/ceph-mds.postrm
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-# postrm script for ceph-mds
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove)
-    ;;
-
-    purge)
-       rm -rf --one-file-system -- /var/lib/ceph/mds || true
-       if [ -d /var/lib/ceph/mds ]; then
-           find /var/lib/ceph/mds -mindepth 1 -maxdepth 1 -type d -exec umount \{\} \;
-       fi
-       rm -rf --one-file-system -- /var/lib/ceph/mds
-    ;;
-
-    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

diff --git a/debian/ceph.postrm b/debian/ceph.postrm
index 7690fcea1b9da21068b8d343078ea26db0529f9b..48e4853c0847920352f5399a4e60fb1006237cf6 100644 (file)
--- a/debian/ceph.postrm
+++ b/debian/ceph.postrm
@@ -26,13 +26,6 @@ case "$1" in
     purge)
        rm -rf /var/log/ceph 
        rm -rf /etc/ceph
-
-       # be a little careful, here: unmount anything beneath here before removing it.
-       rm -rf --one-file-system -- /var/lib/ceph || true
-       if [ -d /var/lib/ceph ]; then
-           find /var/lib/ceph -mindepth 1 -maxdepth 2 -type d -exec umount \{\} \;
-       fi
-       rm -rf --one-file-system -- /var/lib/ceph
     ;;
 
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)