diff options
| author | David Wragg <dpw@lshift.net> | 2009-08-14 01:15:27 +0100 |
|---|---|---|
| committer | David Wragg <dpw@lshift.net> | 2009-08-14 01:15:27 +0100 |
| commit | 8743de3e0c45794d7253933325c251ae61eb793f (patch) | |
| tree | 283bde303268c288e0316b693e8f37616fb41374 | |
| parent | 280790b6016e14612ae83125882978e6a1b48c37 (diff) | |
| download | rabbitmq-server-8743de3e0c45794d7253933325c251ae61eb793f.tar.gz | |
Restore the LOCK_FILE support, as demanded by rpmlint
On Debian, we set the value of LOCK_FILE to the empty string, thus
disabling use of a lock file.
Now tested with rpmlint and lintian.
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 5 | ||||
| -rw-r--r-- | packaging/common/rabbitmq-server.init | 4 | ||||
| -rw-r--r-- | packaging/debs/Debian/Makefile | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index 059acd9f..74760e51 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -29,7 +29,10 @@ prepare: SPECS/rabbitmq-server.spec cp ${COMMON_DIR}/* SOURCES/ - sed -i 's|^DEFAULTS_FILE=.*$$|DEFAULTS_FILE=/etc/sysconfig/rabbitmq|' SOURCES/rabbitmq-server.init + sed -i \ + -e 's|^DEFAULTS_FILE=.*$$|DEFAULTS_FILE=/etc/sysconfig/rabbitmq|' \ + -e 's|^LOCK_FILE=.*$$|LOCK_FILE=/var/lock/subsys/$$NAME|' \ + SOURCES/rabbitmq-server.init cp rabbitmq-server.logrotate SOURCES/rabbitmq-server.logrotate server: prepare diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init index 7d89544f..e3518fcb 100644 --- a/packaging/common/rabbitmq-server.init +++ b/packaging/common/rabbitmq-server.init @@ -25,6 +25,7 @@ NODE_COUNT=1 ROTATE_SUFFIX= DEFAULTS_FILE= # This is filled in when building packages +LOCK_FILE= # This is filled in when building packages test -x $DAEMON || exit 0 @@ -42,6 +43,7 @@ start_rabbitmq () { case "$?" in 0) echo SUCCESS + [ -n "$LOCK_FILE" ] && touch $LOCK_FILE RETVAL=0 ;; 1) @@ -64,6 +66,8 @@ stop_rabbitmq () { RETVAL=$? if [ $RETVAL != 0 ] ; then echo FAILED - check /var/log/rabbitmq/shutdown_log, _err + else + [ -n "$LOCK_FILE" ] && rm -rf $LOCK_FILE fi else echo No nodes running diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile index 4eb38c39..04fd8ada 100644 --- a/packaging/debs/Debian/Makefile +++ b/packaging/debs/Debian/Makefile @@ -21,7 +21,10 @@ package: clean tar -zxvf $(DEBIAN_ORIG_TARBALL) cp -r debian $(UNPACKED_DIR) cp $(COMMON_DIR)/* $(UNPACKED_DIR)/debian/ - sed -i 's|^DEFAULTS_FILE=.*$$|DEFAULTS_FILE=/etc/default/rabbitmq|' $(UNPACKED_DIR)/debian/rabbitmq-server.init + sed -i \ + -e 's|^DEFAULTS_FILE=.*$$|DEFAULTS_FILE=/etc/default/rabbitmq|' \ + -e 's|^LOCK_FILE=.*$$|LOCK_FILE=|' \ + $(UNPACKED_DIR)/debian/rabbitmq-server.init chmod a+x $(UNPACKED_DIR)/debian/rules UNOFFICIAL_RELEASE=$(UNOFFICIAL_RELEASE) VERSION=$(VERSION) ./check-changelog.sh rabbitmq-server $(UNPACKED_DIR) cd $(UNPACKED_DIR); GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING) |