diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-11-16 13:19:00 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-11-16 13:19:00 +0000 |
| commit | fbbcb18fd5cdd925b8f8c92b31f07d381d4bf056 (patch) | |
| tree | 6566c49bfdcd8954b7ff8634712e8824cf6a8dba | |
| parent | 5219ddbda778d0351d133c482f7a054f28043008 (diff) | |
| parent | 92a780eb6ceb5e97cff03dd31e336955dc56f3ab (diff) | |
| download | rabbitmq-server-git-fbbcb18fd5cdd925b8f8c92b31f07d381d4bf056.tar.gz | |
merging bug 21903 into default
| -rw-r--r-- | packaging/common/rabbitmq-server.init | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/postrm.in | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init index dc30597569..39d239835c 100644 --- a/packaging/common/rabbitmq-server.init +++ b/packaging/common/rabbitmq-server.init @@ -66,8 +66,6 @@ stop_rabbitmq () { $DAEMON stop_all > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err RETVAL=$? if [ $RETVAL = 0 ] ; then - # Try to stop epmd if run by the rabbitmq user - pkill -u rabbitmq epmd || : [ -n "$LOCK_FILE" ] && rm -rf $LOCK_FILE else echo FAILED - check ${INIT_LOG_DIR}/shutdown_log, _err diff --git a/packaging/debs/Debian/debian/postrm.in b/packaging/debs/Debian/debian/postrm.in index fc15e034be..bfcf1f530e 100644 --- a/packaging/debs/Debian/debian/postrm.in +++ b/packaging/debs/Debian/debian/postrm.in @@ -40,6 +40,9 @@ case "$1" in rm -f @RABBIT_LIB@/ebin/rabbit.$ext done if getent passwd rabbitmq >/dev/null; then + # Stop epmd if run by the rabbitmq user + pkill -u rabbitmq epmd || : + deluser rabbitmq fi if getent group rabbitmq >/dev/null; then |