From owner-svn-src-head@FreeBSD.ORG  Mon Aug 19 05:37:50 2013
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 929DB779;
 Mon, 19 Aug 2013 05:37:50 +0000 (UTC)
 (envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7F38B2322;
 Mon, 19 Aug 2013 05:37:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7J5bokg041651;
 Mon, 19 Aug 2013 05:37:50 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7J5bor6041650;
 Mon, 19 Aug 2013 05:37:50 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201308190537.r7J5bor6041650@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 19 Aug 2013 05:37:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r254511 - head/etc/rc.d
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 19 Aug 2013 05:37:50 -0000

Author: peter
Date: Mon Aug 19 05:37:49 2013
New Revision: 254511
URL: http://svnweb.freebsd.org/changeset/base/254511

Log:
  Pass pidfile to bsnmpd if it's been changed (parts cut/pasted from
  rc.d/rarpd and rc.d/wpa_supplicant)

Modified:
  head/etc/rc.d/bsnmpd

Modified: head/etc/rc.d/bsnmpd
==============================================================================
--- head/etc/rc.d/bsnmpd	Mon Aug 19 05:12:38 2013	(r254510)
+++ head/etc/rc.d/bsnmpd	Mon Aug 19 05:37:49 2013	(r254511)
@@ -12,7 +12,8 @@
 name="bsnmpd"
 rcvar="bsnmpd_enable"
 command="/usr/sbin/${name}"
-pidfile="/var/run/snmpd.pid"
 
 load_rc_config $name
+pidfile="${bsnmpd_pidfile:-/var/run/snmpd.pid}"
+command_args="-p ${pidfile}"
 run_rc_command "$1"