diff options
author | demon <demon@FreeBSD.org> | 2014-01-25 10:43:47 +0000 |
---|---|---|
committer | demon <demon@FreeBSD.org> | 2014-01-25 10:43:47 +0000 |
commit | db6e97e28efb01c634cde294414c0d121a016168 (patch) | |
tree | 04cabde13e6d7c0c6dd493eff30afcedef730722 /etc | |
parent | f1efe4c670cac047b1e88ce32d6afe83d47a66b1 (diff) | |
download | FreeBSD-src-db6e97e28efb01c634cde294414c0d121a016168.zip FreeBSD-src-db6e97e28efb01c634cde294414c0d121a016168.tar.gz |
Merge r260987:
Do not exit with non-zero return code if sysctl.conf or sysctl.conf.local files
are absent.
Approved by: delphij
Diffstat (limited to 'etc')
-rwxr-xr-x | etc/rc.d/sysctl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/rc.d/sysctl b/etc/rc.d/sysctl index 2420414..6e968f7 100755 --- a/etc/rc.d/sysctl +++ b/etc/rc.d/sysctl @@ -27,7 +27,9 @@ sysctl_start() esac for _f in /etc/sysctl.conf /etc/sysctl.conf.local; do - [ -r ${_f} ] && ${command} ${command_args} ${_f} > /dev/null + if [ -r ${_f} ]; then + ${command} ${command_args} ${_f} > /dev/null + fi done } |