Date: Mon, 10 Dec 2018 14:12:04 +0000 (UTC) From: Eugene Grosbein <eugen@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r341792 - in stable/11/etc: defaults rc.d Message-ID: <201812101412.wBAEC4Cs047393@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eugen Date: Mon Dec 10 14:12:04 2018 New Revision: 341792 URL: https://svnweb.freebsd.org/changeset/base/341792 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/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 Mon Dec 10 14:09:15 2018 (r341791) +++ stable/11/etc/defaults/rc.conf Mon Dec 10 14:12:04 2018 (r341792) @@ -705,6 +705,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/11/etc/rc.d/jail ============================================================================== --- stable/11/etc/rc.d/jail Mon Dec 10 14:09:15 2018 (r341791) +++ stable/11/etc/rc.d/jail Mon Dec 10 14:12:04 2018 (r341792) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812101412.wBAEC4Cs047393>