Date: Sat, 25 Jan 2014 10:43:47 +0000 (UTC) From: Dmitry Sivachenko <demon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r261153 - stable/10/etc/rc.d Message-ID: <201401251043.s0PAhl5J054129@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: demon (ports committer) Date: Sat Jan 25 10:43:47 2014 New Revision: 261153 URL: http://svnweb.freebsd.org/changeset/base/261153 Log: Merge r260987: Do not exit with non-zero return code if sysctl.conf or sysctl.conf.local files are absent. Approved by: delphij Modified: stable/10/etc/rc.d/sysctl Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/rc.d/sysctl ============================================================================== --- stable/10/etc/rc.d/sysctl Sat Jan 25 09:07:55 2014 (r261152) +++ stable/10/etc/rc.d/sysctl Sat Jan 25 10:43:47 2014 (r261153) @@ -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 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401251043.s0PAhl5J054129>