From 5744f5330975640a70fc129a710f43e37dc41ebd Mon Sep 17 00:00:00 2001 From: Eugene Grosbein Date: Mon, 10 Dec 2018 14:09:15 +0000 Subject: [PATCH] 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". --- libexec/rc/rc.conf | 1 + libexec/rc/rc.d/jail | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 9f85270d052..6847a88906c 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -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 diff --git a/libexec/rc/rc.d/jail b/libexec/rc/rc.d/jail index 9e6c7e847db..4a5213e309d 100755 --- a/libexec/rc/rc.d/jail +++ b/libexec/rc/rc.d/jail @@ -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} -- 2.45.0