Module Name:    src
Committed By:   kre
Date:           Sun Apr  1 18:26:51 UTC 2018

Modified Files:
        src/etc: rc.subr

Log Message:
PR misc/53145 (Bruce Lilly)

Use ps -A instead of ps -ax (-A means -ax, but -A is posix, -x is not)
Use ps -o args instead of ps -o command (same reason).

This makes no difference when the ps used is /bin/ps on NetBSD, but
can make a difference when some other ps command gets invoked instead.

XXX pullup -8


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/etc/rc.subr

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/rc.subr
diff -u src/etc/rc.subr:1.100 src/etc/rc.subr:1.101
--- src/etc/rc.subr:1.100	Thu Apr 13 02:15:36 2017
+++ src/etc/rc.subr	Sun Apr  1 18:26:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: rc.subr,v 1.100 2017/04/13 02:15:36 christos Exp $
+# $NetBSD: rc.subr,v 1.101 2018/04/01 18:26:51 kre Exp $
 #
 # Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -235,7 +235,7 @@ check_process()
 	if [ -z "$_procname" ]; then
 		err 3 'USAGE: check_process procname [interpreter]'
 	fi
-	_find_processes $_procname ${_interpreter:-.} '-ax'
+	_find_processes $_procname ${_interpreter:-.} '-A'
 }
 
 #
@@ -294,7 +294,7 @@ _find_processes()
 	fi
 
 	_proccheck='
-		ps -o "pid,command" '"$_psargs"' |
+		ps -o "pid,args" '"$_psargs"' |
 		while read _npid '"$_fp_args"'; do
 			case "$_npid" in
 			    PID)

Reply via email to