From owner-cvs-src@FreeBSD.ORG  Fri Aug 17 07:58:27 2007
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6EAB216A41A;
	Fri, 17 Aug 2007 07:58:27 +0000 (UTC) (envelope-from mtm@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6396613C48A;
	Fri, 17 Aug 2007 07:58:27 +0000 (UTC) (envelope-from mtm@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7H7wRkg097008;
	Fri, 17 Aug 2007 07:58:27 GMT (envelope-from mtm@repoman.freebsd.org)
Received: (from mtm@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7H7wRbV097007;
	Fri, 17 Aug 2007 07:58:27 GMT (envelope-from mtm)
Message-Id: <200708170758.l7H7wRbV097007@repoman.freebsd.org>
From: Mike Makonnen <mtm@FreeBSD.org>
Date: Fri, 17 Aug 2007 07:58:27 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/etc/rc.d Makefile lockd nfslocking statd
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Aug 2007 07:58:27 -0000

mtm         2007-08-17 07:58:27 UTC

  FreeBSD src repository

  Modified files:
    etc/rc.d             Makefile lockd nfslocking statd 
  Log:
  The rc.d/nfslocking file controls two servers: rpc.statd and rpc.lockd. It worked well
  in most cases, except one. The 'restart' case was not working as expected. Specifically,
  it would stop both lockd and statd, but it would restart only statd (which appears first
  in the script). This is because rc.subr(8) contains code to guard against infinite
  recursion in the 'restart' casae.
  
  To fix this use the traditional approach of controlling only one server from one script by
  breaking out rc.d/nfslocking into its contituent parts: rc.d/lockd and rc.d/statd. Keep
  rc.d/nfslocking around but don't include it in the boot rcorder(8)ing.
  
  PR:          conf/107316
  Approved by: re (bmah)
  MFC after:   2 weeks
  
  Revision  Changes    Path
  1.82      +2 -2      src/etc/rc.d/Makefile
  1.16      +2 -27     src/etc/rc.d/lockd
  1.15      +1 -1      src/etc/rc.d/nfslocking
  1.16      +2 -27     src/etc/rc.d/statd