Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Jan 2014 18:57:49 +0000 (UTC)
From:      Dmitry Sivachenko <demon@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r260987 - head/etc/rc.d
Message-ID:  <201401211857.s0LIvnL9007099@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: demon (ports committer)
Date: Tue Jan 21 18:57:49 2014
New Revision: 260987
URL: http://svnweb.freebsd.org/changeset/base/260987

Log:
  Do not exit with non-zero return code if sysctl.conf or sysctl.conf.local files
  are absent.
  
  Approved by:	delphij

Modified:
  head/etc/rc.d/sysctl

Modified: head/etc/rc.d/sysctl
==============================================================================
--- head/etc/rc.d/sysctl	Tue Jan 21 16:49:54 2014	(r260986)
+++ head/etc/rc.d/sysctl	Tue Jan 21 18:57:49 2014	(r260987)
@@ -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?201401211857.s0LIvnL9007099>