CVS: init.d autofs, 1.1.1.1, 1.2 named, 1.1.1.1, 1.2 nfs, 1.1.1.1, 1.2 nfslock, 1.1.1.1, 1.2 pcmcia, 1.1.1.1, 1.2

[Chuck Mead]

Update of /var/cvs/lunar/init.d
In directory dbguin.lunar-linux.org:/tmp/cvs-serv21180

Modified Files:
	autofs named nfs nfslock pcmcia 
Log Message:
correcting improper paths to pidof


Index: autofs
===================================================================
RCS file: /var/cvs/lunar/init.d/autofs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- autofs	26 Oct 2003 17:59:26 -0000	1.1.1.1
+++ autofs	29 Oct 2003 23:51:34 -0000	1.2
@@ -258,10 +258,10 @@
         	RETVAL=$?
 	fi
         count=0
-        while [ -n "`/sbin/pidof $DAEMON`" -a $count -lt 8 ] ; do
+        while [ -n "`/bin/pidof $DAEMON`" -a $count -lt 8 ] ; do
 	    killproc $DAEMON -USR2
             RETVAL=$?
-	    [ $RETVAL = 0 -a -z "`/sbin/pidof $DAEMON`" ] || sleep ${count+1}
+	    [ $RETVAL = 0 -a -z "`/bin/pidof $DAEMON`" ] || sleep ${count+1}
             count=`expr $count + 1`
         done
         umount -a -f -t autofs

Index: named
===================================================================
RCS file: /var/cvs/lunar/init.d/named,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- named	26 Oct 2003 17:59:27 -0000	1.1.1.1
+++ named	29 Oct 2003 23:51:34 -0000	1.2
@@ -29,7 +29,7 @@
 
 start() {
         # Start daemons.
-	if [ -n "`/sbin/pidof named`" ]; then
+	if [ -n "`/bin/pidof named`" ]; then
 		echo -n $"$prog: already running"
 		return 1
 	fi
@@ -71,7 +71,7 @@
 }	
 reload() {
         echo -n $"Reloading $prog: "
-	/usr/sbin/rndc reload >/dev/null 2>&1 || /usr/bin/killall -HUP `/sbin/pidof -o %PPID named`
+	/usr/sbin/rndc reload >/dev/null 2>&1 || /usr/bin/killall -HUP `/bin/pidof -o %PPID named`
 	[ "$?" -eq 0 ] && success $"$prog reload" || failure $"$prog reload"
         echo
 	return $?

Index: nfs
===================================================================
RCS file: /var/cvs/lunar/init.d/nfs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- nfs	26 Oct 2003 17:59:27 -0000	1.1.1.1
+++ nfs	29 Oct 2003 23:51:34 -0000	1.2
@@ -151,8 +151,8 @@
 	if [ ! -f /var/lock/subsys/nfs ] ; then
 	  echo $"start"; exit 0
 	fi
-	/sbin/pidof rpc.mountd >/dev/null 2>&1; MOUNTD="$?"
-	/sbin/pidof nfsd >/dev/null 2>&1; NFSD="$?"
+	/bin/pidof rpc.mountd >/dev/null 2>&1; MOUNTD="$?"
+	/bin/pidof nfsd >/dev/null 2>&1; NFSD="$?"
 	if [ $MOUNTD = 1 -o $NFSD = 1 ] ; then
 	  echo $"restart"; exit 0
 	fi

Index: nfslock
===================================================================
RCS file: /var/cvs/lunar/init.d/nfslock,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- nfslock	26 Oct 2003 17:59:27 -0000	1.1.1.1
+++ nfslock	29 Oct 2003 23:51:34 -0000	1.2
@@ -109,9 +109,9 @@
 	if [ ! -f /var/lock/subsys/nfslock ] ; then
 	  echo $"start"; exit 0
 	fi
-	/sbin/pidof rpc.statd >/dev/null 2>&1; STATD="$?"
+	/bin/pidof rpc.statd >/dev/null 2>&1; STATD="$?"
 	if [ "$USERLAND_LOCKD" ]; then
-	   /sbin/pidof lockd >/dev/null 2>&1; LOCKD="$?"
+	   /bin/pidof lockd >/dev/null 2>&1; LOCKD="$?"
 	else
 	   LOCKD=0
 	fi

Index: pcmcia
===================================================================
RCS file: /var/cvs/lunar/init.d/pcmcia,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- pcmcia	26 Oct 2003 17:59:27 -0000	1.1.1.1
+++ pcmcia	29 Oct 2003 23:51:34 -0000	1.2
@@ -161,7 +161,7 @@
 	;;
 
     status)
-	pid=`/sbin/pidof cardmgr`
+	pid=`/bin/pidof cardmgr`
 	if [ "$pid" != "" ] ; then
 	    echo $"cardmgr (pid $pid) is running..."
 	    EXITCODE=0