svn commit: r332363 - in stable/11: etc sys/sys

[Kyle Evans]

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,