diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-11-19 16:05:55 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-11-19 16:05:55 +0000 |
| commit | 67bc8c8b9e69bc53221a9bd914e418d81d6cdc7d (patch) | |
| tree | 7d222a83de8d7e5d1465e33f3c24660799770c92 /etc | |
| parent | 2828dafcf3e7b225b70cbb380eb8c7dae452493e (diff) | |
| parent | 57b28934e964b15f1fcd91734c6dbef762222079 (diff) | |
| download | src-67bc8c8b9e69bc53221a9bd914e418d81d6cdc7d.tar.gz src-67bc8c8b9e69bc53221a9bd914e418d81d6cdc7d.zip | |
Merge ^/head r308491 through r308841.
Notes
Notes:
svn path=/projects/clang390-import/; revision=308842
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/devd/hyperv.conf | 16 | ||||
| -rw-r--r-- | etc/mtree/BSD.include.dist | 2 | ||||
| -rw-r--r-- | etc/rc.subr | 27 |
3 files changed, 29 insertions, 16 deletions
diff --git a/etc/devd/hyperv.conf b/etc/devd/hyperv.conf index bed7383d0816..0abf284a9ce0 100644 --- a/etc/devd/hyperv.conf +++ b/etc/devd/hyperv.conf @@ -17,3 +17,19 @@ notify 10 { match "cdev" "hv_kvp_dev"; action "pkill -x hv_kvp_daemon"; }; + +notify 11 { + match "system" "DEVFS"; + match "subsystem" "CDEV"; + match "type" "CREATE"; + match "cdev" "hv_fsvss_dev"; + action "/usr/sbin/hv_vss_daemon"; +}; + +notify 11 { + match "system" "DEVFS"; + match "subsystem" "CDEV"; + match "type" "DESTROY"; + match "cdev" "hv_fsvss_dev"; + action "pkill -x hv_vss_daemon"; +}; diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 5beaf3d2db60..8a9bbeabdb99 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -118,6 +118,8 @@ .. hwpmc .. + hyperv + .. ic .. iicbus diff --git a/etc/rc.subr b/etc/rc.subr index 0201f0595c67..7eaa13a9401d 100644 --- a/etc/rc.subr +++ b/etc/rc.subr @@ -1206,22 +1206,17 @@ $command $rc_flags $command_args" 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) - case $_oomprotect in - [Aa][Ll][Ll]) - ${PROTECT} -i -p ${pid} - ;; - [Yy][Ee][Ss]) - ${PROTECT} -p ${pid} - ;; - esac - fi + if [ -n "$_oomprotect" ] && [ -f "${PROTECT}" ] && + [ "$(sysctl -n security.jail.jailed)" -eq 0 ]; then + pid=$(check_process $command) + case $_oomprotect in + [Aa][Ll][Ll]) + ${PROTECT} -i -p ${pid} + ;; + [Yy][Ee][Ss]) + ${PROTECT} -p ${pid} + ;; + esac fi ;; esac |