From 6109ca574807c9d59e4d90a6c1366d724df0aed3 Mon Sep 17 00:00:00 2001
From: dteske <dteske@FreeBSD.org>
Date: Tue, 13 Dec 2016 04:47:21 +0000
Subject: [PATCH] MFC r307159: Add jail_confwarn="NO" (default YES)

Differential Revision:	https://reviews.freebsd.org/D7465
Reviewed by:	jelischer
Sponsored by:	FIS Global, Inc.
---
 etc/defaults/rc.conf | 1 +
 etc/rc.d/jail        | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 33a1ce4d581..18ee897bfb5 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 216c80e7fca..8cf830a139a 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."
-- 
2.45.0