From owner-svn-src-all@FreeBSD.ORG  Sat Jan 25 10:43:47 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ABCED6D1;
 Sat, 25 Jan 2014 10:43:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9709E15A3;
 Sat, 25 Jan 2014 10:43:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PAhlHV054130;
 Sat, 25 Jan 2014 10:43:47 GMT (envelope-from demon@svn.freebsd.org)
Received: (from demon@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PAhl5J054129;
 Sat, 25 Jan 2014 10:43:47 GMT (envelope-from demon@svn.freebsd.org)
Message-Id: <201401251043.s0PAhl5J054129@svn.freebsd.org>
From: Dmitry Sivachenko <demon@FreeBSD.org>
Date: Sat, 25 Jan 2014 10:43:47 +0000 (UTC)
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
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Jan 2014 10:43:47 -0000

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
 }