Attachment 295025 Details for Bug 433018 – proposed patch to rc.d/init.d/functions

proposed patch to rc.d/init.d/functions

status_pidfile.patch (text/x-patch), 1.26 KB, created by Matthew Farrellee on 2008-02-15 18:14:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Farrellee

Created: 2008-02-15 18:14:35 UTC

Size: 1.26 KB

patch

obsolete

>diff -rupN initscripts-8.63/rc.d/init.d/functions initscripts-8.63mf/rc.d/init.d/functions
>--- initscripts-8.63/rc.d/init.d/functions	2007-10-08 14:18:54.000000000 -0500
>+++ initscripts-8.63mf/rc.d/init.d/functions	2008-02-15 11:41:42.000000000 -0600
>@@ -385,25 +385,31 @@ status() {
> 	fi
> 	base=${1##*/}
> 
>-	# First try "pidof"
>+	# If a pid_file exists only try it
>+	if [ -f "$pid_file" -o -f "/var/run/$base.pid" ]; then
>+	    __pids_var_run "$1" "$pid_file"
>+	    case "$?" in
>+		0)
>+		    echo $"${base} (pid $pid) is running..."
>+		    return 0
>+		    ;;
>+		1)
>+	            echo $"${base} dead but pid file exists"
>+	            return 1
>+		    ;;
>+		3)
>+	            echo $"${base} is stopped"
>+	            return 3
>+		    ;;
>+	    esac
>+	fi
>+
>+	# Try "pidof"
> 	pid="$(__pids_pidof "$1")"
> 	if [ -n "$pid" ]; then
> 	        echo $"${base} (pid $pid) is running..."
> 	        return 0
> 	fi
>-
>-	# Next try "/var/run/*.pid" files
>-	__pids_var_run "$1" "$pid_file"
>-	case "$?" in
>-		0)
>-			echo $"${base} (pid $pid) is running..."
>-			return 0
>-			;;
>-		1)
>-	                echo $"${base} dead but pid file exists"
>-	                return 1
>-			;;
>-	esac
> 	# See if /var/lock/subsys/${base} exists
> 	if [ -f /var/lock/subsys/${base} ]; then
> 		echo $"${base} dead but subsys locked"

Actions: View

Attachments on bug 433018: 295025