[packages/postgrey] fixed pidfile header (used by systemd), do not wrap with daemon() - these date back to initial commi

gotar gotar at pld-linux.org
Tue Aug 7 10:06:10 CEST 2018


commit e8e7d086492bf6a39954fbddf6271ac95eacfcec
Author: Tomasz Pala <gotar at pld-linux.org>
Date:   Tue Aug 7 10:02:19 2018 +0200

    fixed pidfile header (used by systemd), do not wrap with daemon()
    - these date back to initial commit; always remove lockfile on stop()

 postgrey.init | 6 +++---
 postgrey.spec | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/postgrey.spec b/postgrey.spec
index 971bd69..745aa70 100644
--- a/postgrey.spec
+++ b/postgrey.spec
@@ -3,7 +3,7 @@ Summary:	Postfix Greylisting Policy Server
 Summary(pl.UTF-8):	Serwer do polityki "szarych list" dla Postfiksa
 Name:		postgrey
 Version:	1.37
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://postgrey.schweikert.ch/pub/%{name}-%{version}.tar.gz
diff --git a/postgrey.init b/postgrey.init
index 172f5f3..1aacced 100644
--- a/postgrey.init
+++ b/postgrey.init
@@ -6,7 +6,7 @@
 # description:	Postfix Greylisting Policy Server
 #
 # processname:	postgrey
-# pidfile:	/var/run/greylist.pid
+# pidfile:	/var/run/postgrey.pid
 #
 
 # Source function library
@@ -40,7 +40,7 @@ case "$1" in
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/postgrey ]; then
 		msg_starting postgrey
-		daemon /usr/sbin/postgrey -d --pidfile=/var/run/postgrey.pid $OPTIONS
+		/usr/sbin/postgrey -d --pidfile=/var/run/postgrey.pid $OPTIONS
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/postgrey
 	else
@@ -51,10 +51,10 @@ case "$1" in
 	if [ -f /var/lock/subsys/postgrey ]; then
 		msg_stopping postgrey
 		killproc postgrey
-		rm -f /var/lock/subsys/postgrey >/dev/null 2>&1
 	else
 		msg_not_running postgrey
 	fi
+	rm -f /var/lock/subsys/postgrey >/dev/null 2>&1
 	;;
   restart)
 	$0 stop
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/postgrey.git/commitdiff/e8e7d086492bf6a39954fbddf6271ac95eacfcec



More information about the pld-cvs-commit mailing list