diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2012-09-28 16:33:19 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2012-09-28 16:33:19 +0100 |
| commit | ef32fd17a363ec7a1170acd2f39614aab38704f6 (patch) | |
| tree | 2330a1d36e25bdf65bc6f3d7fb871d1dc0941614 | |
| parent | 2123d74f5d1360fca9c1f51c960ff5484d10eb2a (diff) | |
| download | rabbitmq-server-ef32fd17a363ec7a1170acd2f39614aab38704f6.tar.gz | |
Change RPM service launcher
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 7 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.init | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index 03e513f8..6c75f6ad 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -13,13 +13,15 @@ RPM_OS=fedora endif ifeq "$(RPM_OS)" "suse" +FUNCTION_LIBRARY= REQUIRES=/sbin/chkconfig /sbin/service OS_DEFINES=--define '_initrddir /etc/init.d' --define 'dist .suse' -START_PROG=setsid +START_PROG=startproc else +FUNCTION_LIBRARY=\# Source function library.\n. /etc/init.d/functions REQUIRES=chkconfig initscripts OS_DEFINES=--define '_initrddir /etc/rc.d/init.d' -START_PROG=runuser rabbitmq --session-command +START_PROG=daemon endif rpms: clean server @@ -35,6 +37,7 @@ prepare: cp rabbitmq-server.init SOURCES/rabbitmq-server.init sed -i \ -e 's|^START_PROG=.*$$|START_PROG="$(START_PROG)"|' \ + -e 's|^@FUNCTION_LIBRARY@|$(FUNCTION_LIBRARY)|' \ SOURCES/rabbitmq-server.init ifeq "$(RPM_OS)" "fedora" # Fedora says that only vital services should have Default-Start diff --git a/packaging/RPMS/Fedora/rabbitmq-server.init b/packaging/RPMS/Fedora/rabbitmq-server.init index 2d2680e3..4bf778b3 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.init +++ b/packaging/RPMS/Fedora/rabbitmq-server.init @@ -16,6 +16,8 @@ # Short-Description: Enable AMQP service provided by RabbitMQ broker ### END INIT INFO +@FUNCTION_LIBRARY@ + PATH=/sbin:/usr/sbin:/bin:/usr/bin NAME=rabbitmq-server DAEMON=/usr/sbin/${NAME} |