diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-11-10 22:12:19 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-11-10 22:12:19 +0000 |
| commit | 2828dafcf3e7b225b70cbb380eb8c7dae452493e (patch) | |
| tree | 8c38da97c8d6131d6248b65de6651466757db025 /etc | |
| parent | a2b802ce707809349e00536a3a61edc13ff172e7 (diff) | |
| parent | 3b49535a5a124165d6521ca19e12c0a457ca13b8 (diff) | |
| download | src-2828dafcf3e7b225b70cbb380eb8c7dae452493e.tar.gz src-2828dafcf3e7b225b70cbb380eb8c7dae452493e.zip | |
Merge ^/head r308227 through r308490.
Notes
Notes:
svn path=/projects/clang390-import/; revision=308491
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/devd.conf | 4 | ||||
| -rw-r--r-- | etc/rc.subr | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/etc/devd.conf b/etc/devd.conf index e4bd915d6ab3..164ab6e76c2e 100644 --- a/etc/devd.conf +++ b/etc/devd.conf @@ -23,8 +23,8 @@ options { esp|ida|iir|ips|isp|mlx|mly|mpt|ncr|ncv|nsp|stg|sym|trm)\ [0-9]+"; set wifi-driver-regex - "(ath|bwi|bwn|ipw|iwi|iwm|iwn|malo|mwl|ral|rsu|rum|run|uath|\ - upgt|ural|urtw|rtwn_usb|wi|wpi|wtap|zyd)[0-9]+"; + "(ath|bwi|bwn|ipw|iwi|iwm|iwn|malo|mwl|ral|rsu|rtwn|rum|run|\ + uath|upgt|ural|urtw|wi|wpi|wtap|zyd)[0-9]+"; }; # Note that the attach/detach with the highest value wins, so that one can diff --git a/etc/rc.subr b/etc/rc.subr index 5b29ccf2e0b7..0201f0595c67 100644 --- a/etc/rc.subr +++ b/etc/rc.subr @@ -1205,6 +1205,11 @@ $command $rc_flags $command_args" # Apply protect(1) to the PID if ${name}_oomprotect is set. case "$rc_arg" in start) + # We cannot use protect(1) inside jails. + jailed="$(sysctl -n security.jail.jailed)" + if [ ${jailed} -eq 1 ]; then + return $_return + fi if [ -n "$_oomprotect" ]; then if [ -f "${PROTECT}" ]; then pid=$(check_process $command) |