File use-killproc-in-stop-branch-of-SuSE-init-script... of Package firebird-classic

Overview Repositories Revisions Requests Users Attributes Meta

File use-killproc-in-stop-branch-of-SuSE-init-script.patch of Package firebird-classic (Revision 10970d9f825884afc01c1ccfe4692431)

Currently displaying revision 10970d9f825884afc01c1ccfe4692431 , Show latest

From: Michal Kubecek <mkubecek@suse.cz>
Date: Sun, 3 Jun 2012 15:21:44 +0200
Subject: use killproc in stop branch of SuSE init script

In "stop" branch of SuSE init script, use killproc and fbguard
pidfile.
---
 .../arch-specific/linux/misc/firebird.init.d.suse.in  | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/builds/install/arch-specific/linux/misc/firebird.init.d.suse.in b/builds/install/arch-specific/linux/misc/firebird.init.d.suse.in
index 1d18309..45611a9 100644
--- a/builds/install/arch-specific/linux/misc/firebird.init.d.suse.in
+++ b/builds/install/arch-specific/linux/misc/firebird.init.d.suse.in
@@ -43,6 +43,7 @@ test "$START_FIREBIRD" = yes || exit 0
 
 FIREBIRD=@FB_CONFDIR@
 FBRunUser=firebird
+FBRunGroup=firebird
 INSTANCE=default
 
 makeFbDir() {
@@ -55,14 +56,15 @@ makeFbDir() {
 			chmod $mode $mDir
 		fi
 	fi
-	chown $FBRunUser:$FBRunUser $mDir
+	chown $FBRunUser:$FBRunGroup $mDir
 }
-runDir=/var/run/firebird
-makeFbDir $runDir
+runDir=@FB_GUARDDIR@
+makeFbDir $runDir 0755
 lockDir=/tmp/firebird
 makeFbDir $lockDir 0770
 
 pidfile="$runDir/$INSTANCE.pid"
+gpidfile="$runDir/${INSTANCE}-guard.pid"
 
 export FIREBIRD
 
@@ -116,7 +118,8 @@ case "$1" in
 
 	# NOTE: startproc return 0, even if service is
 	# already running to match LSB spec.
-	startproc -u $FBRunUser $FBSBIN/fbguard -pidfile $pidfile -forever
+	startproc -u $FBRunUser $FBSBIN/fbguard -forever \
+		-pidfile $pidfile -gpidfile $gpidfile
 
 	# Remember status and be verbose
 	rc_status -v
@@ -126,13 +129,7 @@ case "$1" in
 	## Stop daemon with killproc(8) and if this fails
 	## set echo the echo return value.
 
-	## I had to use generic approach here - I can't test on suse. AP.
-	if [ -f $pidfile ]
-	then
-		kill `cat $pidfile`
-		sleep 1
-	fi
-		
+	killproc -p $gpidfile ${FBSBIN}/fbguard
 
 	# Remember status and be verbose
 	rc_status -v
-- 
1.8.4.5

Places

File use-killproc-in-stop-branch-of-SuSE-init-script.patch of Package firebird-classic (Revision 10970d9f825884afc01c1ccfe4692431)

Places