diff options
| author | dteske <dteske@FreeBSD.org> | 2016-12-13 04:50:45 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2016-12-13 04:50:45 +0000 |
| commit | 75203c0bfe0031fcf50336b21c54a5f1e42735cd (patch) | |
| tree | 2697ba6649610d157f1c732f1ba0c2368e48f01e | |
| parent | 6109ca574807c9d59e4d90a6c1366d724df0aed3 (diff) | |
| download | FreeBSD-src-75203c0bfe0031fcf50336b21c54a5f1e42735cd.zip FreeBSD-src-75203c0bfe0031fcf50336b21c54a5f1e42735cd.tar.gz | |
MFC r309504: Fix bug preventing limits(1) from being applied
PR: misc/212493
Differential Revision: https://reviews.freebsd.org/D8232
Submitted by: girgen
Reviewed by: adrian
| -rw-r--r-- | etc/rc.subr | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/etc/rc.subr b/etc/rc.subr index 4b8cbaa..7d88efc 100644 --- a/etc/rc.subr +++ b/etc/rc.subr @@ -1045,6 +1045,7 @@ run_rc_command() # check_startmsgs && echo "Starting ${name}." if [ -n "$_chroot" ]; then + _cd= _doit="\ ${_nice:+nice -n $_nice }\ ${_fib:+setfib -F $_fib }\ @@ -1052,8 +1053,8 @@ ${_env:+env $_env }\ chroot ${_user:+-u $_user }${_group:+-g $_group }${_groups:+-G $_groups }\ $_chroot $command $rc_flags $command_args" else + _cd="${_chdir:+cd $_chdir && }" _doit="\ -${_chdir:+cd $_chdir && }\ ${_fib:+setfib -F $_fib }\ ${_env:+env $_env }\ $command $rc_flags $command_args" @@ -1072,7 +1073,7 @@ $command $rc_flags $command_args" fi # Prepend default limits - _doit="limits -C $_login_class $_doit" + _doit="$_cd limits -C $_login_class $_doit" # run the full command # |
