diff options
author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-10-25 10:42:52 +0000 |
---|---|---|
committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-10-25 10:42:52 +0000 |
commit | 83f713bbf53343ede7efd313ddcbf2986e7771e7 (patch) | |
tree | 38809987304dffcf8b79ad7e1bb39e6daab08a29 /etc/rc | |
parent | d3ddeeb366f1f76ecb30b26abc81bfb007f69833 (diff) |
Partially revert rev 1.457 of /etc/rc. The pipe introduced in
sysctl_conf() spawns a subshell. This prevents that the new process
limits affect the daemons started during boot.
OK rpe@ halex@
Diffstat (limited to 'etc/rc')
-rw-r--r-- | etc/rc | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.519 2017/10/12 18:14:05 rpe Exp $ +# $OpenBSD: rc,v 1.520 2017/10/25 10:42:51 bluhm Exp $ # System startup script run by init on autoboot or after single-user. # Output and error are redirected to console by init, and the console is the @@ -49,16 +49,20 @@ update_limit() { # Apply sysctl.conf(5) settings. sysctl_conf() { - stripcom /etc/sysctl.conf | - while read _line; do - sysctl "$_line" + # do not use a pipe as limits would only be applied to the subshell + set -- $(stripcom /etc/sysctl.conf) + while [[ $# > 0 ]] ; do + sysctl "$1" - case $_line in + case "$1" in kern.maxproc=*) - update_limit -p maxproc;; + update_limit -p maxproc + ;; kern.maxfiles=*) - update_limit -n openfiles;; + update_limit -n openfiles + ;; esac + shift done } |