PERFORCE change 104643 for review

[Michael Bushkov]

http://perforce.freebsd.org/chv.cgi?CH=104643

Change 104643 by bushman at bushman_nss_ldap_cached_make on 2006/08/21 01:42:34

	IFC

Affected files ...

.. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pccard_ether#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.subr#3 integrate

Differences ...

==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pccard_ether#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD: src/etc/pccard_ether,v 1.49 2006/08/17 03:03:38 brooks Exp $
+# $FreeBSD: src/etc/pccard_ether,v 1.50 2006/08/18 13:19:45 brooks Exp $
 #
 # pccard_ether interfacename [start|stop|restart]
 #
@@ -67,6 +67,8 @@
 
 pccard_ether_start()
 {
+	ifexists $ifn || exit 1
+
 	if [ -z "$rc_force" -a -x /usr/bin/grep ]; then
 		if ifconfig $ifn | grep -s '[<,]UP[,>]' > /dev/null 2>&1; then
 		    # Interface is already up, so ignore it.

==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.subr#3 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: rc.subr,v 1.66 2006/04/01 10:05:50 he Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.65 2006/08/17 08:04:20 yar Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.67 2006/08/18 13:07:38 yar Exp $
 #
 # Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -54,8 +54,9 @@
 CMD_OSTYPE="${SYSCTL_N} kern.ostype"
 OSTYPE=`${CMD_OSTYPE}`
 ID="/usr/bin/id"
-JID=`ps -p $$ -o jid=`
 IDCMD="if [ -x $ID ]; then $ID -un; fi"
+PS="/bin/ps -ww"
+JID=`$PS -p $$ -o jid=`
 
 case ${OSTYPE} in
 FreeBSD)
@@ -278,13 +279,10 @@
 		    $_procname|$_procnamebn|${_procnamebn}:|"(${_procnamebn})"|"[${_procnamebn}]")'
 	fi
 
-	_proccheck='
-		ps 2>/dev/null -o "pid,jid,command" '"$_psargs"' |
+	_proccheck="\
+		$PS 2>/dev/null -o pid= -o jid= -o command= $_psargs"' |
 		while read _npid _jid '"$_fp_args"'; do
-			case "$_npid" in
-			PID)
-				continue;;
-			esac; '"$_fp_match"'
+			'"$_fp_match"'
 				if [ "$JID" -eq "$_jid" ];
 				then echo -n "$_pref$_npid";
 				_pref=" ";