Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src/etc Pull up following revision(s) (requested by kre in ti...



details:   https://anonhg.NetBSD.org/src/rev/98d58350be42
branches:  netbsd-8
changeset: 434820:98d58350be42
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Apr 04 16:07:33 2018 +0000

description:
Pull up following revision(s) (requested by kre in ticket #689):
        etc/rc.subr: revision 1.101

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

diffstat:

 etc/rc.subr |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r d86541402d5c -r 98d58350be42 etc/rc.subr
--- a/etc/rc.subr       Mon Apr 02 09:53:08 2018 +0000
+++ b/etc/rc.subr       Wed Apr 04 16:07:33 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rc.subr,v 1.100 2017/04/13 02:15:36 christos Exp $
+# $NetBSD: rc.subr,v 1.100.4.1 2018/04/04 16:07:33 martin Exp $
 #
 # Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -235,7 +235,7 @@
        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 @@
        fi
 
        _proccheck='
-               ps -o "pid,command" '"$_psargs"' |
+               ps -o "pid,args" '"$_psargs"' |
                while read _npid '"$_fp_args"'; do
                        case "$_npid" in
                            PID)



Home | Main Index | Thread Index | Old Index