summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2012-03-22 12:51:50 +0000
committerEmile Joubert <emile@rabbitmq.com>2012-03-22 12:51:50 +0000
commit3be2b57c84597eb47f49a83f63c49fb099002491 (patch)
treea5f591b067f936f9ed53cff967024c46c4dfa095
parentb983d5dafe4cba0204cd70bf2be991d4cf8e2349 (diff)
downloadrabbitmq-server-bug24809.tar.gz
Rollback startup method for SuSE onlybug24809
-rw-r--r--packaging/RPMS/Fedora/Makefile4
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