summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjilles <jilles@FreeBSD.org>2013-03-22 20:12:25 +0000
committerjilles <jilles@FreeBSD.org>2013-03-22 20:12:25 +0000
commitb69a01f7fa17e5a12ea96e92f6b20999f3383222 (patch)
tree7b6965bef69ace070d3ce3380900d53958b08f12
parentb291eafe8d40c45b908e0f6481f471ca44a0a2f8 (diff)
downloadFreeBSD-src-b69a01f7fa17e5a12ea96e92f6b20999f3383222.zip
FreeBSD-src-b69a01f7fa17e5a12ea96e92f6b20999f3383222.tar.gz
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
-rwxr-xr-xetc/rc.d/sysctl6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/rc.d/sysctl b/etc/rc.d/sysctl
index cc3e801..2420414 100755
--- a/etc/rc.d/sysctl
+++ b/etc/rc.d/sysctl
@@ -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
OpenPOWER on IntegriCloud