From nobody Wed Mar 09 21:22:45 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 117D119F49AD; Wed, 9 Mar 2022 21:22:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KDQC96t2kz3nS5; Wed, 9 Mar 2022 21:22:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646860966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d+T29vh9D8afePMPCpQfhouIymDSFMk/Jj6SC6gMVQg=; b=WKayND7Z/dDz59MxgdHFJCKOu81CJNS0IMAgrYpluY7Uus7oTpJUntlPbtHBlWFlVnEsJz sjAJd+zgQJwb2QDI6dfKpjNvwFu21P+7SOcUcNyDlY91AYN3ssH1Htd0c78aXYYTS9tY2D G3kLf7ye+gwlibtyB0NXsSLgs6zwE996oAIfjEjirFDm7uW9rGVnOi4XSFeXS0Zn9kNDu+ PLJL4A8um4uz+Aib/bVkUl6rjzCKlF3God63mRvb1VS3pGLp2Xu9k/loMKVFDpB7mfX0Dx rKq/Ok9w9hluUz2rlQWWBP5ssdaOATVdAyGWP/EKLuyuyzqWs60kNmaBgD/b2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA80618797; Wed, 9 Mar 2022 21:22:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 229LMjO1003289; Wed, 9 Mar 2022 21:22:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 229LMjSE003288; Wed, 9 Mar 2022 21:22:45 GMT (envelope-from git) Date: Wed, 9 Mar 2022 21:22:45 GMT Message-Id: <202203092122.229LMjSE003288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 065edb739e15 - stable/13 - Add support for jail.conf.d List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 065edb739e151d4058448414c545f76d8cdc9a9c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646860966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d+T29vh9D8afePMPCpQfhouIymDSFMk/Jj6SC6gMVQg=; b=GDH4R/bvocu33ktUFIHuIbTWlcchtqhnPBCFITlWIVzGPz/LCxsxDeXy6jd/cWrSy1bHHh daqs7vp9bEXAY6rB4/xp7PUHgxmwXgAQM+NK6NeR+D32BgRR6bM1Wn6ETjvSlUEZKXpzaM uQPHYVA4kb4jdd6lFDGFJ6TYWFJT0Rc/AfwEjm3xODPwQdWQZc3cPSmFDiSa/m/wShrxa8 SAeo6QqWAupAQ9JpMEwddieT4KZylKW8PTA96O1Omz440cMf7Yd+LMf3Y6eGp63mLNm2eK FooA29zO5cJqTzqQre4Hv1YA/BsZHppz1MwsBxZTBZkA2VTn/FYXIWN7LVgnBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646860966; a=rsa-sha256; cv=none; b=u830LTQUZ1lbpLeZC1Zj8tOG71YaJSPd7VZNgCeuB40QytmnkXoJk/qTlFKc8+MDCC7hLV 87ZGzAVPMsg7Chr3eQpKOvQwcbHL7PuV8jmilz2iau3xqYlJqyOyLUQNJy4O1pllaNWBW0 OnnphT+2S83zV5zxNB9B1AZKdGtOgjGUuuqNgrxGI4FJ1ZTctcjWa4scCrGwXc1pwSEUyn 1xa++kMxS3vkFgBsZNVJwklUhGHjxKaNkZPN9iIn0Kt9qpxdJhlcH72dVE/WhQyTptpUIM FQ0t8V2kuyfT6i/Z6ui1sODYUGakROudny+tq5HbcjseiMHb0828s0W5TiOpbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=065edb739e151d4058448414c545f76d8cdc9a9c commit 065edb739e151d4058448414c545f76d8cdc9a9c Author: Antranig Vartanian AuthorDate: 2021-09-08 07:07:49 +0000 Commit: Kyle Evans CommitDate: 2022-03-09 21:21:49 +0000 Add support for jail.conf.d Using /etc/jail.{jailname}.conf is nice, however it makes /etc/ very messy if you have many jails. This patch allows one to move these config files out of the way into /etc/jail.conf.d/{jailname}.conf. Note that the same caveat as /etc/jail.*.conf applies: the jail service will not autodiscover all of these for starting 'all' jails. This is considered future work, since the behavior matches. (cherry picked from commit 7955efd574b98601a95da45d6d8e7f452631fddd) --- etc/mtree/BSD.root.dist | 2 ++ libexec/rc/rc.d/jail | 4 ++++ share/man/man5/rc.conf.5 | 9 ++++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index f734f7891429..8bea31212217 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -56,6 +56,8 @@ .. gss .. + jail.conf.d + .. kyua tags=package=tests .. mail diff --git a/libexec/rc/rc.d/jail b/libexec/rc/rc.d/jail index ff4336131bc9..1d544501e32b 100755 --- a/libexec/rc/rc.d/jail +++ b/libexec/rc/rc.d/jail @@ -120,12 +120,16 @@ parse_options() fi eval _jconf=\"\${jail_${_jv}_conf:-/etc/jail.${_j}.conf}\" eval _rootdir=\"\$jail_${_jv}_rootdir\" + eval _jconfdir=\"/etc/jail.conf.d/${_j}.conf\" eval _hostname=\"\$jail_${_jv}_hostname\" if [ -z "$_rootdir" -o \ -z "$_hostname" ]; then if [ -r "$_jconf" ]; then _conf="$_jconf" return 0 + elif [ -r "$_jconfdir" ]; then + _conf="$_jconfdir" + return 0 elif [ -r "$jail_conf" ]; then _conf="$jail_conf" return 0 diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index fad969b008d8..ff9123163a1e 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 3, 2022 +.Dd March 9, 2022 .Dt RC.CONF 5 .Os .Sh NAME @@ -3899,6 +3899,13 @@ The configuration filename used by utility. The default value is .Pa /etc/jail.conf . +.Pa /etc/jail. Ns Ao Ar jname Ac Ns Va .conf +and +.Pa /etc/jail.conf.d/ Ns Ao Ar jname Ac Ns Va .conf +will also be used if +.Va Ao Ar jname Ac Va +is set in +.Va jail_list . .It Va jail_parallel_start .Pq Vt bool If set to