From owner-svn-src-all@freebsd.org Sat Nov 10 22:44:04 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E3304110D279; Sat, 10 Nov 2018 22:44:03 +0000 (UTC) (envelope-from devin@shxd.cx) Received: from shxd.cx (mail.shxd.cx [64.201.244.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6CFB27FC95; Sat, 10 Nov 2018 22:44:03 +0000 (UTC) (envelope-from devin@shxd.cx) Received: from [64.201.244.132] (port=54562 helo=[10.0.0.105]) by shxd.cx with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1gLbyl-000CZw-MA; Sat, 10 Nov 2018 22:43:47 +0000 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Subject: Re: svn commit: r340321 - in head/libexec/rc: . rc.d From: Devin Teske In-Reply-To: <201811101411.wAAEBtlk047673@repo.freebsd.org> Date: Sat, 10 Nov 2018 14:44:00 -0800 Cc: Devin Teske , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <2DB908B9-5A1D-49CA-BD3C-6F5D356C6F3C@FreeBSD.org> References: <201811101411.wAAEBtlk047673@repo.freebsd.org> To: Eugene Grosbein X-Mailer: Apple Mail (2.3445.9.1) Sender: devin@shxd.cx X-Rspamd-Queue-Id: 6CFB27FC95 X-Spamd-Result: default: False [1.14 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.21)[0.211,0]; RCPT_COUNT_FIVE(0.00)[5]; NEURAL_HAM_LONG(-0.71)[-0.707,0]; MX_GOOD(-0.01)[cached: mail.shxd.cx]; NEURAL_HAM_SHORT(-0.04)[-0.039,0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[dteske@FreeBSD.org,devin@shxd.cx]; R_DKIM_NA(0.00)[]; IP_SCORE(-0.02)[country: US(-0.09)]; ASN(0.00)[asn:36734, ipnet:64.201.240.0/20, country:US]; FROM_NEQ_ENVFROM(0.00)[dteske@FreeBSD.org,devin@shxd.cx]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Nov 2018 22:44:04 -0000 This also allows "sysrc -d jail_conf" to print "Configuration file for = jail(8)" Thanks. --=20 Cheers, Devin > On Nov 10, 2018, at 6:11 AM, Eugene Grosbein = wrote: >=20 > Author: eugen > Date: Sat Nov 10 14:11:54 2018 > New Revision: 340321 > URL: https://svnweb.freebsd.org/changeset/base/340321 >=20 > 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". >=20 > MFC after: 1 month >=20 > Modified: > head/libexec/rc/rc.conf > head/libexec/rc/rc.d/jail >=20 > Modified: head/libexec/rc/rc.conf > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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=3D"" # Config files for = iovctl(8) > ### Jail Configuration (see rc.conf(5) manual page) ########## > ############################################################## > jail_enable=3D"NO" # Set to NO to disable starting of any jails > +jail_conf=3D"/etc/jail.conf" # Configuration file for jail(8) > jail_confwarn=3D"YES" # Prevent warning about obsolete per-jail = configuration > jail_parallel_start=3D"NO" # Start jails in the background > jail_list=3D"" # Space separated list of names of jails >=20 > Modified: head/libexec/rc/rc.d/jail > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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=3D"jail_config" > console_cmd=3D"jail_console" > status_cmd=3D"jail_status" > extra_commands=3D"config console status" > -: ${jail_conf:=3D/etc/jail.conf} > : ${jail_program:=3D/usr/sbin/jail} > : ${jail_consolecmd:=3D/usr/bin/login -f root} > : ${jail_jexec:=3D/usr/sbin/jexec} >=20