Use daemon binary name for stopping

phl0 · phl0 · commit 048fb786a090 · 2018-05-15T12:28:36.000+02:00
diff --git a/LinuxExtras/Debian/ircDDBGateway/etc/init.d/ircddbgateway b/LinuxExtras/Debian/ircDDBGateway/etc/init.d/ircddbgateway
@@ -124,7 +124,7 @@ do_stop()
     	    sleep 15
 	fi                    
 
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $DAEMON_NAME
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 
@@ -153,7 +153,7 @@ do_reload() {
 	# restarting (for example, when it is sent a SIGHUP),
 	# then implement that here.
 	#
-	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $DAEMON_NAME
 	return 0
 }
 
diff --git a/LinuxExtras/Raspbian/ircDDBGateway/etc/init.d/ircddbgateway b/LinuxExtras/Raspbian/ircDDBGateway/etc/init.d/ircddbgateway
@@ -124,7 +124,7 @@ do_stop()
     	    sleep 15
 	fi                    
 
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $DAEMON_NAME
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 	
@@ -153,7 +153,7 @@ do_reload() {
 	# restarting (for example, when it is sent a SIGHUP),
 	# then implement that here.
 	#
-	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $DAEMON_NAME
 	return 0
 }
 

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ do_stop()`
`124`	`124`	`sleep 15`
`125`	`125`	`fi`
`126`	`126`
`127`		`- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME`
	`127`	`+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $DAEMON_NAME`
`128`	`128`	`RETVAL="$?"`
`129`	`129`	`[ "$RETVAL" = 2 ] && return 2`
`130`	`130`
`@@ -153,7 +153,7 @@ do_reload() {`
`153`	`153`	`# restarting (for example, when it is sent a SIGHUP),`
`154`	`154`	`# then implement that here.`
`155`	`155`	`#`
`156`		`- start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME`
	`156`	`+ start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $DAEMON_NAME`
`157`	`157`	`return 0`
`158`	`158`	`}`
`159`	`159`