From owner-svn-src-stable@freebsd.org Tue Apr 10 13:35:08 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 504E2F9D5A2; Tue, 10 Apr 2018 13:35:08 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ED3E96F0B1; Tue, 10 Apr 2018 13:35:07 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E42CD6420; Tue, 10 Apr 2018 13:35:07 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3ADZ7e3062807; Tue, 10 Apr 2018 13:35:07 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3ADZ75V062805; Tue, 10 Apr 2018 13:35:07 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201804101335.w3ADZ75V062805@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Tue, 10 Apr 2018 13:35:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r332363 - in stable/11: etc sys/sys X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/11: etc sys/sys X-SVN-Commit-Revision: 332363 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2018 13:35:08 -0000 Author: kevans Date: Tue Apr 10 13:35:07 2018 New Revision: 332363 URL: https://svnweb.freebsd.org/changeset/base/332363 Log: Revert r331880, MFC of r328331 and bump FreeBSD_version There are logistics issues that weren't considered when this was originally MFC'd. All rc scripts in ports need audited (this is in progress) for usage of ${name}_limits that doesn't line up with the new interpretation, and individual rc.conf(5)'s need to be scrubbed of usage that doesn't line up. It's since been decided that it should be left for a feature in 12. 1101514 introduced interpretation of ${name}_limits for rc scripts; this feature no longer exists as of 1101515. Modified: stable/11/etc/rc.subr stable/11/sys/sys/param.h Directory Properties: stable/11/ (props changed) Modified: stable/11/etc/rc.subr ============================================================================== --- stable/11/etc/rc.subr Tue Apr 10 13:25:42 2018 (r332362) +++ stable/11/etc/rc.subr Tue Apr 10 13:35:07 2018 (r332363) @@ -773,8 +773,6 @@ check_startmsgs() # # ${name}_login_class n Login class to use, else "daemon". # -# ${name}_limits n limits(1) to apply to ${command}. -# # ${rc_arg}_cmd n If set, use this as the method when invoked; # Otherwise, use default command (see below) # @@ -954,7 +952,7 @@ run_rc_command() _group=\$${name}_group _groups=\$${name}_groups \ _fib=\$${name}_fib _env=\$${name}_env \ _prepend=\$${name}_prepend _login_class=\${${name}_login_class:-daemon} \ - _limits=\$${name}_limits _oomprotect=\$${name}_oomprotect + _oomprotect=\$${name}_oomprotect if [ -n "$_user" ]; then # unset $_user if running as that user if [ "$_user" = "$(eval $IDCMD)" ]; then @@ -1075,7 +1073,7 @@ $command $rc_flags $command_args" fi # Prepend default limits - _doit="$_cd limits -C $_login_class $_limits $_doit" + _doit="$_cd limits -C $_login_class $_doit" # run the full command # Modified: stable/11/sys/sys/param.h ============================================================================== --- stable/11/sys/sys/param.h Tue Apr 10 13:25:42 2018 (r332362) +++ stable/11/sys/sys/param.h Tue Apr 10 13:35:07 2018 (r332363) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1101514 /* Master, propagated to newvers */ +#define __FreeBSD_version 1101515 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,