D24570.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D24570.diff
View Options

	diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
	--- a/etc/mtree/BSD.root.dist
	+++ b/etc/mtree/BSD.root.dist
	@@ -56,6 +56,8 @@
	..
	gss
	..
	+ jail.conf.d
	+ ..
	kyua tags=package=tests
	..
	mail
	diff --git a/libexec/rc/rc.d/jail b/libexec/rc/rc.d/jail
	--- a/libexec/rc/rc.d/jail
	+++ b/libexec/rc/rc.d/jail
	@@ -120,12 +120,16 @@
	fi
	eval _jconf=\"\${jail_${_jv}_conf:-/etc/jail.${_j}.conf}\"
	eval _rootdir=\"\$jail_${_jv}_rootdir\"
	+ eval _jconfdir=\"/etc/jail.conf.d/${_j}.conf\"
	eval _hostname=\"\$jail_${_jv}_hostname\"
	if [ -z "$_rootdir" -o \
	-z "$_hostname" ]; then
	if [ -r "$_jconf" ]; then
	_conf="$_jconf"
	return 0
	+ elif [ -r "$_jconfdir" ]; then
	+ _conf="$_jconfdir"
	+ return 0
	elif [ -r "$jail_conf" ]; then
	_conf="$jail_conf"
	return 0
	diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
	--- a/share/man/man5/rc.conf.5
	+++ b/share/man/man5/rc.conf.5
	@@ -24,7 +24,7 @@
	.\"
	.\" $FreeBSD$
	.\"
	-.Dd July 8, 2021
	+.Dd September 10, 2021
	.Dt RC.CONF 5
	.Os
	.Sh NAME
	@@ -3883,6 +3883,13 @@
	utility.
	The default value is
	.Pa /etc/jail.conf .
	+.Pa /etc/jail. Ns Ao Ar jname Ac Ns Va .conf
	+and
	+.Pa /etc/jail.conf.d/ Ns Ao Ar jname Ac Ns Va .conf
	+will also be used if
	+.Va Ao Ar jname Ac Va
	+is set in
	+.Va jail_list .
	.It Va jail_parallel_start
	.Pq Vt bool
	If set to