From owner-svn-src-all@FreeBSD.ORG  Fri Mar 22 20:12:26 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 449F66D7;
 Fri, 22 Mar 2013 20:12:26 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 36D2B2B5;
 Fri, 22 Mar 2013 20:12:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2MKCQvI006637;
 Fri, 22 Mar 2013 20:12:26 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2MKCQga006636;
 Fri, 22 Mar 2013 20:12:26 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201303222012.r2MKCQga006636@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Fri, 22 Mar 2013 20:12:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248620 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Mar 2013 20:12:26 -0000

Author: jilles
Date: Fri Mar 22 20:12:25 2013
New Revision: 248620
URL: http://svnweb.freebsd.org/changeset/base/248620

Log:
  rc.d/sysctl: Fix error messages about unknown OIDs.
  
  There are three situations where the sysctl script is called:
  1. "start", very early
  2. "lastload", near the end of rc
  3. "reload", at admin request while the system is booted
  
  Ignore unknown OIDs in situation 1 because kernel modules may not be loaded
  yet and complain about them in situations 2 and 3.
  
  PR:		conf/174595
  Submitted by:	Olivier Smedts

Modified:
  head/etc/rc.d/sysctl

Modified: head/etc/rc.d/sysctl
==============================================================================
--- head/etc/rc.d/sysctl	Fri Mar 22 17:55:38 2013	(r248619)
+++ head/etc/rc.d/sysctl	Fri Mar 22 20:12:25 2013	(r248620)
@@ -11,7 +11,7 @@ name="sysctl"
 command="/sbin/sysctl"
 stop_cmd=":"
 start_cmd="sysctl_start"
-reload_cmd="sysctl_start"
+reload_cmd="sysctl_start last"
 lastload_cmd="sysctl_start last"
 extra_commands="reload lastload"
 
@@ -19,10 +19,10 @@ sysctl_start()
 {
 	case $1 in
 	last)
-		command_args="-i -f"
+		command_args="-f"
 	;;
 	*)
-		command_args="-f"
+		command_args="-i -f"
 	;;
 	esac