svn commit: r261153 - stable/10/etc/rc.d

[Dmitry Sivachenko]

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
 }