Attachment 644338 Details for Bug 850944 – fix dnsmasq initscript to only recognize/act on self-initiated dnsmasq instances

[patch] fix dnsmasq initscript to only recognize/act on self-initiated dnsmasq instances

dnsmasq-2.48-initscript-get-correct-pid.patch (text/plain), 1.07 KB, created by Laine Stump on 2012-11-13 18:51:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Laine Stump

Created: 2012-11-13 18:51:36 UTC

Size: 1.07 KB

patch

obsolete

>diff -rupN dnsmasq-2.48-orig/rpm/dnsmasq.init dnsmasq-2.48-new/rpm/dnsmasq.init
>--- dnsmasq-2.48-orig/rpm/dnsmasq.init	2012-11-13 13:09:43.710928447 -0500
>+++ dnsmasq-2.48-new/rpm/dnsmasq.init	2012-11-13 13:30:33.475178122 -0500
>@@ -40,9 +40,9 @@ case "$1" in
>         [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dnsmasq
>         ;;
>   stop)
>-        if test "x`pidof dnsmasq`" != x; then
>+        if test "x`pidfileofproc dnsmasq`" != x; then
>             echo -n "Shutting down dnsmasq: "
>-            killproc dnsmasq
>+            kill `pidfileofproc dnsmasq`
>         fi
> 	RETVAL=$?
>         echo
>@@ -53,8 +53,10 @@ case "$1" in
> 	RETVAL=$?
> 	;;
>   reload)
>-	echo -n "Reloading dnsmasq: "
>-	killproc dnsmasq -HUP
>+        if test "x`pidfileofproc dnsmasq`" != x; then
>+	    echo -n "Reloading dnsmasq: "
>+            kill -HUP `pidfileofproc dnsmasq`
>+        fi
> 	RETVAL=$?
> 	echo
> 	;;
>@@ -70,7 +72,7 @@ case "$1" in
> 	RETVAL=$?
> 	;;
>   condrestart)
>-	    if test "x`/sbin/pidof dnsmasq`" != x; then
>+	    if test "x`/sbin/pidfileofproc dnsmasq`" != x; then
> 		$0 stop
> 		$0 start
> 		RETVAL=$?

Actions: View | Diff

Attachments on bug 850944: 644338 | 647838 | 666124