svn commit: r341791 - in stable/12/libexec/rc: . rc.d

[Eugene Grosbein]

Author: eugen
Date: Mon Dec 10 14:09:15 2018
New Revision: 341791
URL: https://svnweb.freebsd.org/changeset/base/341791

Log:
  MFC r340321: Move definition of $jail_conf variable to /etc/defaults/rc.conf
  from jail startup script so it can be successfully queried
  with the command "sysrc jail_conf".

Modified:
  stable/12/libexec/rc/rc.conf
  stable/12/libexec/rc/rc.d/jail
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/libexec/rc/rc.conf
==============================================================================
--- stable/12/libexec/rc/rc.conf	Mon Dec 10 13:47:05 2018	(r341790)
+++ stable/12/libexec/rc/rc.conf	Mon Dec 10 14:09:15 2018	(r341791)
@@ -703,6 +703,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_conf="/etc/jail.conf"	# Configuration file for jail(8)
 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

Modified: stable/12/libexec/rc/rc.d/jail
==============================================================================
--- stable/12/libexec/rc/rc.d/jail	Mon Dec 10 13:47:05 2018	(r341790)
+++ stable/12/libexec/rc/rc.d/jail	Mon Dec 10 14:09:15 2018	(r341791)
@@ -21,7 +21,6 @@ config_cmd="jail_config"
 console_cmd="jail_console"
 status_cmd="jail_status"
 extra_commands="config console status"
-: ${jail_conf:=/etc/jail.conf}
 : ${jail_program:=/usr/sbin/jail}
 : ${jail_consolecmd:=/usr/bin/login -f root}
 : ${jail_jexec:=/usr/sbin/jexec}