Author: kevans
Date: Mon Apr 2 15:28:48 2018
New Revision: 331880
URL: https://svnweb.freebsd.org/changeset/base/331880
Log:
MFC r328331: Support configuring arbitrary limits(1) for any rc.conf daemon
Usage is ${name}_limits, and the argument is any flags accepted by
limits(1), such as `-n 100' (e.g. only allow 100 open files).
Modified:
stable/11/etc/rc.subr
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/etc/rc.subr
==============================================================================
--- stable/11/etc/rc.subr Mon Apr 2 15:07:41 2018 (r331879)
+++ stable/11/etc/rc.subr Mon Apr 2 15:28:48 2018 (r331880)
@@ -773,6 +773,8 @@ 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)
#
@@ -952,7 +954,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} \
- _oomprotect=\$${name}_oomprotect
+ _limits=\$${name}_limits _oomprotect=\$${name}_oomprotect
if [ -n "$_user" ]; then # unset $_user if running as that user
if [ "$_user" = "$(eval $IDCMD)" ]; then
@@ -1073,7 +1075,7 @@ $command $rc_flags $command_args"
fi
# Prepend default limits
- _doit="$_cd limits -C $_login_class $_doit"
+ _doit="$_cd limits -C $_login_class $_limits $_doit"
# run the full command
#
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
