svn commit: r248620 - head/etc/rc.d

[Jilles Tjoelker]

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