diff options
| author | Steve Powell <steve@rabbitmq.com> | 2012-03-05 11:01:55 +0000 |
|---|---|---|
| committer | Steve Powell <steve@rabbitmq.com> | 2012-03-05 11:01:55 +0000 |
| commit | b6d1a50efa00f523083b4fbe030716abc7163e18 (patch) | |
| tree | 0d4a935449d2cee5d744f11ea3d9bc73dbf95a56 /packaging | |
| parent | ac114c61b2bb8585c058a048adf2ae1ffc6a37ab (diff) | |
| download | rabbitmq-server-git-b6d1a50efa00f523083b4fbe030716abc7163e18.tar.gz | |
Modify packaging for Debian to use start-stop-daemon
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/common/rabbitmq-server.init | 10 | ||||
| -rw-r--r-- | packaging/debs/Debian/Makefile | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init index 4084d8c715..2347de7b24 100644 --- a/packaging/common/rabbitmq-server.init +++ b/packaging/common/rabbitmq-server.init @@ -26,7 +26,8 @@ ROTATE_SUFFIX= INIT_LOG_DIR=/var/log/rabbitmq PID_FILE=/var/run/rabbitmq/pid -LOCK_FILE= # This is filled in when building packages +START_PROG= # Set when building package +LOCK_FILE= # Set when building package test -x $DAEMON || exit 0 test -x $CONTROL || exit 0 @@ -56,10 +57,9 @@ start_rabbitmq () { RETVAL=0 ensure_pid_dir set +e - RABBITMQ_PID_FILE=$PID_FILE setsid $DAEMON \ - > "${INIT_LOG_DIR}/startup_log" \ - 2> "${INIT_LOG_DIR}/startup_err" \ - 0<&- & + RABBITMQ_PID_FILE=$PID_FILE $START_PROG $DAEMON \ + > ${INIT_LOG_DIR}/startup_log \ + 2> ${INIT_LOG_DIR}/startup_err 0<&- & $CONTROL wait $PID_FILE >/dev/null 2>&1 RETVAL=$? set -e diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile index 79e9c1dd72..2a738f6e7a 100644 --- a/packaging/debs/Debian/Makefile +++ b/packaging/debs/Debian/Makefile @@ -26,6 +26,7 @@ package: clean # runlevel 2 should start network services. sed -i \ -e 's|^LOCK_FILE=.*$$|LOCK_FILE=|' \ + -e 's|^START_PROG=.*$$|START_PROG="start-stop-daemon -v --chuid rabbitmq --start --exec"|' \ -e 's|^\(# Default-Start:\).*$$|\1 2 3 4 5|' \ -e 's|^\(# Default-Stop:\).*$$|\1 0 1 6|' \ $(UNPACKED_DIR)/debian/rabbitmq-server.init |