diff options
| author | kevans <kevans@FreeBSD.org> | 2018-04-10 13:35:07 +0000 |
|---|---|---|
| committer | kevans <kevans@FreeBSD.org> | 2018-04-10 13:35:07 +0000 |
| commit | cd0cede0d4d96cb71ae4a69959fdf43018fdba00 (patch) | |
| tree | fe98dda9a31ae296ab0e113abc5d334dec23d875 /etc/rc.subr | |
| parent | 296396ec4622b7d20731fb064fa26791ec7a8006 (diff) | |
| download | FreeBSD-src-cd0cede0d4d96cb71ae4a69959fdf43018fdba00.zip FreeBSD-src-cd0cede0d4d96cb71ae4a69959fdf43018fdba00.tar.gz | |
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.
Diffstat (limited to 'etc/rc.subr')
| -rw-r--r-- | etc/rc.subr | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/etc/rc.subr b/etc/rc.subr index 358c53f..bfa43e2 100644 --- a/etc/rc.subr +++ b/etc/rc.subr @@ -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 # |
