diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-04-25 13:35:02 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-04-25 13:35:02 +0100 |
| commit | 7951e808088d577bb46eb7f0852aaa75ba7ba8c5 (patch) | |
| tree | 413a91fdfb657561f1dd391119b4df715e499a29 | |
| parent | f2fe4337e7f7583d313754e5dafc3f51d8fc2408 (diff) | |
| download | rabbitmq-server-bug24790.tar.gz | |
One less substitution. Pity RHEL and SUSE also differ gratuitously.bug24790
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 1 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.init | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index 13996f9b..180500ed 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -34,7 +34,6 @@ prepare: cp ${COMMON_DIR}/* SOURCES/ cp rabbitmq-server.init SOURCES/rabbitmq-server.init sed -i \ - -e 's|^LOCK_FILE=.*$$|LOCK_FILE=/var/lock/subsys/$$NAME|' \ -e 's|^START_PROG=.*$$|START_PROG="$(START_PROG)"|' \ SOURCES/rabbitmq-server.init ifeq "$(RPM_OS)" "fedora" diff --git a/packaging/RPMS/Fedora/rabbitmq-server.init b/packaging/RPMS/Fedora/rabbitmq-server.init index 40238c8e..2d2680e3 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.init +++ b/packaging/RPMS/Fedora/rabbitmq-server.init @@ -27,7 +27,7 @@ INIT_LOG_DIR=/var/log/rabbitmq PID_FILE=/var/run/rabbitmq/pid START_PROG= # Set when building package -LOCK_FILE= # Set when building package +LOCK_FILE=/var/lock/subsys/$NAME test -x $DAEMON || exit 0 test -x $CONTROL || exit 0 |