diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2012-03-22 14:03:37 +0000 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2012-03-22 14:03:37 +0000 |
| commit | ef819492f1af54c9eafb10ec826b585632ebb2d7 (patch) | |
| tree | c42109a3949cb9287a0e6ed7405442b0196d189a | |
| parent | bf2274252d423b96901577e72d1bcfca830223f6 (diff) | |
| parent | 3be2b57c84597eb47f49a83f63c49fb099002491 (diff) | |
| download | rabbitmq-server-ef819492f1af54c9eafb10ec826b585632ebb2d7.tar.gz | |
Merged bug24809 into defaultrabbitmq_v2_8_1
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index f1925757..234fc2c7 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -15,9 +15,11 @@ endif ifeq "$(RPM_OS)" "suse" REQUIRES=/sbin/chkconfig /sbin/service OS_DEFINES=--define '_initrddir /etc/init.d' --define 'dist .suse' +START_PROG=setsid else REQUIRES=chkconfig initscripts OS_DEFINES=--define '_initrddir /etc/rc.d/init.d' +START_PROG=runuser rabbitmq --session-command endif rpms: clean server @@ -32,7 +34,7 @@ prepare: cp ${COMMON_DIR}/* SOURCES/ sed -i \ -e 's|^LOCK_FILE=.*$$|LOCK_FILE=/var/lock/subsys/$$NAME|' \ - -e 's|^START_PROG=.*$$|START_PROG="runuser rabbitmq --session-command"|' \ + -e 's|^START_PROG=.*$$|START_PROG="$(START_PROG)"|' \ SOURCES/rabbitmq-server.init ifeq "$(RPM_OS)" "fedora" # Fedora says that only vital services should have Default-Start |