From owner-svn-src-head@FreeBSD.ORG  Mon Dec 27 22:52:48 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 556AC1065670;
	Mon, 27 Dec 2010 22:52:48 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4389B8FC20;
	Mon, 27 Dec 2010 22:52:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBRMqm9A038844;
	Mon, 27 Dec 2010 22:52:48 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBRMqmaw038842;
	Mon, 27 Dec 2010 22:52:48 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201012272252.oBRMqmaw038842@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 27 Dec 2010 22:52:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216744 - head/etc/rc.d
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Dec 2010 22:52:48 -0000

Author: dougb
Date: Mon Dec 27 22:52:47 2010
New Revision: 216744
URL: http://svn.freebsd.org/changeset/base/216744

Log:
  Add pidfile [1]
  
  While I'm here, don't run the sysctl frob unconditionally, and
  s/sysctl/$SYSCTL/
  
  PR:		conf/153460 [1]
  Submitted by:	Grigory Rechistov <ggg_mail@inbox.ru>

Modified:
  head/etc/rc.d/devd

Modified: head/etc/rc.d/devd
==============================================================================
--- head/etc/rc.d/devd	Mon Dec 27 22:18:27 2010	(r216743)
+++ head/etc/rc.d/devd	Mon Dec 27 22:52:47 2010	(r216744)
@@ -13,11 +13,17 @@
 name="devd"
 rcvar=`set_rcvar`
 command="/sbin/${name}"
+pidfile=/var/run/${name}.pid
+
+start_precmd=${name}_prestart
+
+devd_prestart ()
+{
+	# If devd is disabled, turn it off in the kernel to avoid memory leaks.
+	if ! checkyesno ${rcvar}; then
+	    $SYSCTL hw.bus.devctl_disable=1
+	fi
+}
 
 load_rc_config $name
 run_rc_command "$1"
-
-# If devd is disabled, turn it off in the kernel to avoid memory leaks.
-if ! checkyesno ${rcvar}; then
-    sysctl hw.bus.devctl_disable=1
-fi