diff options
| author | dteske <dteske@FreeBSD.org> | 2016-12-13 04:47:21 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2016-12-13 04:47:21 +0000 |
| commit | 6109ca574807c9d59e4d90a6c1366d724df0aed3 (patch) | |
| tree | ee7a5d951536422f603f0f6f4b7c44b226a8a2ca /etc | |
| parent | 3511b45986ee13cc3c49dc3fb276cafce7caa4e5 (diff) | |
| download | FreeBSD-src-6109ca574807c9d59e4d90a6c1366d724df0aed3.zip FreeBSD-src-6109ca574807c9d59e4d90a6c1366d724df0aed3.tar.gz | |
MFC r307159: Add jail_confwarn="NO" (default YES)
Differential Revision: https://reviews.freebsd.org/D7465
Reviewed by: jelischer
Sponsored by: FIS Global, Inc.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/defaults/rc.conf | 1 | ||||
| -rwxr-xr-x | etc/rc.d/jail | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 33a1ce4..18ee897 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -701,6 +701,7 @@ iovctl_files="" # Config files for iovctl(8) ### Jail Configuration (see rc.conf(5) manual page) ########## ############################################################## jail_enable="NO" # Set to NO to disable starting of any jails +jail_confwarn="YES" # Prevent warning about obsolete per-jail configuration jail_parallel_start="NO" # Start jails in the background jail_list="" # Space separated list of names of jails jail_reverse_stop="NO" # Stop jails in reverse order diff --git a/etc/rc.d/jail b/etc/rc.d/jail index 216c80e..8cf830a 100755 --- a/etc/rc.d/jail +++ b/etc/rc.d/jail @@ -147,7 +147,8 @@ parse_options() # # To relieve confusion, show a warning message. # - _confwarn=1 + : ${jail_confwarn:=YES} + checkyesno jail_confwarn && _confwarn=1 if [ -r "$jail_conf" -o -r "$_jconf" ]; then if ! checkyesno jail_parallel_start; then warn "$_conf is created and used for jail $_j." |
