svn commit: r310009 - in stable/11/etc: defaults rc.d

[Devin Teske]

Author: dteske
Date: Tue Dec 13 04:47:21 2016
New Revision: 310009
URL: https://svnweb.freebsd.org/changeset/base/310009

Log:
  MFC r307159: Add jail_confwarn="NO" (default YES)
  
  Differential Revision:	https://reviews.freebsd.org/D7465
  Reviewed by:	jelischer
  Sponsored by:	FIS Global, Inc.

Modified:
  stable/11/etc/defaults/rc.conf
  stable/11/etc/rc.d/jail
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/etc/defaults/rc.conf
==============================================================================
--- stable/11/etc/defaults/rc.conf	Tue Dec 13 04:45:21 2016	(r310008)
+++ stable/11/etc/defaults/rc.conf	Tue Dec 13 04:47:21 2016	(r310009)
@@ -701,6 +701,7 @@ iovctl_files=""		# Config files for iovc
 ### 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

Modified: stable/11/etc/rc.d/jail
==============================================================================
--- stable/11/etc/rc.d/jail	Tue Dec 13 04:45:21 2016	(r310008)
+++ stable/11/etc/rc.d/jail	Tue Dec 13 04:47:21 2016	(r310009)
@@ -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."