Date: Sat, 10 Nov 2018 14:44:00 -0800 From: Devin Teske <dteske@FreeBSD.org> To: Eugene Grosbein <eugen@FreeBSD.org> Cc: Devin Teske <dteske@FreeBSD.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r340321 - in head/libexec/rc: . rc.d Message-ID: <2DB908B9-5A1D-49CA-BD3C-6F5D356C6F3C@FreeBSD.org> In-Reply-To: <201811101411.wAAEBtlk047673@repo.freebsd.org> References: <201811101411.wAAEBtlk047673@repo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
This also allows "sysrc -d jail_conf" to print "Configuration file for jail(8)" Thanks. -- Cheers, Devin > On Nov 10, 2018, at 6:11 AM, Eugene Grosbein <eugen@FreeBSD.org> wrote: > > Author: eugen > Date: Sat Nov 10 14:11:54 2018 > New Revision: 340321 > URL: https://svnweb.freebsd.org/changeset/base/340321 > > Log: > 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". > > MFC after: 1 month > > Modified: > head/libexec/rc/rc.conf > head/libexec/rc/rc.d/jail > > Modified: head/libexec/rc/rc.conf > ============================================================================== > --- head/libexec/rc/rc.conf Sat Nov 10 13:16:54 2018 (r340320) > +++ head/libexec/rc/rc.conf Sat Nov 10 14:11:54 2018 (r340321) > @@ -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: head/libexec/rc/rc.d/jail > ============================================================================== > --- head/libexec/rc/rc.d/jail Sat Nov 10 13:16:54 2018 (r340320) > +++ head/libexec/rc/rc.d/jail Sat Nov 10 14:11:54 2018 (r340321) > @@ -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} >help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2DB908B9-5A1D-49CA-BD3C-6F5D356C6F3C>