diff options
author | Jilles Tjoelker <jilles@FreeBSD.org> | 2013-03-22 20:12:25 +0000 |
---|---|---|
committer | Jilles Tjoelker <jilles@FreeBSD.org> | 2013-03-22 20:12:25 +0000 |
commit | 7f16286cd112749aab99b93e07f40059a6636079 (patch) | |
tree | 7b6965bef69ace070d3ce3380900d53958b08f12 /etc/rc.d/sysctl | |
parent | 6888a9be566d79246a948dcc4c0a914b1bee0c32 (diff) | |
download | src-7f16286cd112749aab99b93e07f40059a6636079.tar.gz src-7f16286cd112749aab99b93e07f40059a6636079.zip |
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
Notes
Notes:
svn path=/head/; revision=248620
Diffstat (limited to 'etc/rc.d/sysctl')
-rwxr-xr-x | etc/rc.d/sysctl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/rc.d/sysctl b/etc/rc.d/sysctl index cc3e801c366e..2420414d4ad6 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 |