From nobody Fri Jun 28 19:50:02 2024 X-Original-To: dev-commits-src-all@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 4W9mHZ322lz5PDMl; Fri, 28 Jun 2024 19:50:02 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9mHZ2W70z437c; Fri, 28 Jun 2024 19:50:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719604202; 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=7ddQK1ZTs9EGmID73Ko9FJgYdS0aL03C6R4/kcooPJk=; b=yLr7IQiwbJFVpHlTDx/N0agXCBsC7j/lpuHj+YZTyi9yUP8PsR/bZP26vZEroTizNvrz5Z pkCdQlzSwgwbZwl+zynmYMJ6VSyMmnV0SFTSGQijkU2XnE3pkMg5hAglIVRU1JnDl25aEd LDxiiGuSwv/9ke5Yei1JrUzDla0yEdZBxwDN332A8tvM5A2NTPJZhSSNZwPlt9PWCGp5YF vISEldv0mW9rQmU5a2QtOFXotfBbrtlt51ifaDlzwDWTiA8Ny5BB5aaXdABtM/deV0GRyD hqXTGSjZ9NnW3KdX6n79GQ48zQeanxZbHl1g38Q7W/E31gLHpHpfQtydr+BMsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719604202; a=rsa-sha256; cv=none; b=m+GFnXv4oAod4wG/hUE28BNUhlwTAcOMPUeTXfUIrVstnZwHePZ4JCCJblgZBIaL1N6R4Q Leb5+OqIy//rL70rdxeaJYJHK3LIg+hASPc7hLtMXUHsugaFms68sXRqLsK0BFUsr79OcD 1OIN3JP1MVnXjHtQpePi1QQKLH4usQj4PkaRJLbC8mA2+DG8xtKZ+5m5hD7iiSn7OyzZw3 Z61IVNXjtD7Styr80zpN4Fq4CcEXmIvuw/bBLP4MYlRXBgtAOQEJrVPT1NpAKwywsm49P/ tMRXroqiBC2PCSIQYBSX/JiN0HY5KyHKpx68KuLIGbfKVa8UleVnk+nCmnZq5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719604202; 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=7ddQK1ZTs9EGmID73Ko9FJgYdS0aL03C6R4/kcooPJk=; b=YZtGq3OEy5PkBBHsPUBULgANkOTWtXUKoNjmvdeai2EU603qZolDhl/Zw5v1bK/kSK2npE JTHU7Wg4eB3FJ39nI2fd4Px1CscC3Q6KPyciJJ03Pm73eCvMt3QAPEM53wL3pzIq/wxBdG MtwjtSM6/tN3sE6SFyWABsnERfAOpeo1DpkraH7o1LKCJKjazJ2Ux3xvizlNu929wCbbt3 gLTBvdmGPPOrI7O1aOFSdZF3kxq4fPq/1hUrBFkBtoVL7l8ki3P7RDAqtoe84PqovtvGsM n+zZgG3eSKxeYBtzh6RWGVEji87sEm2Stur5XYbsagPrxcxLmWCAnCAkjGG49g== 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 4W9mHZ26x3z181D; Fri, 28 Jun 2024 19:50:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SJo22u040812; Fri, 28 Jun 2024 19:50:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SJo2cG040808; Fri, 28 Jun 2024 19:50:02 GMT (envelope-from git) Date: Fri, 28 Jun 2024 19:50:02 GMT Message-Id: <202406281950.45SJo2cG040808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: bb7b7b0eb7cf - stable/14 - MFC zfs/jail: Document the zfs.mount_snapshot parameter in jail(8). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bb7b7b0eb7cf64109f05136d921a357f58839ba1 Auto-Submitted: auto-generated The branch stable/14 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=bb7b7b0eb7cf64109f05136d921a357f58839ba1 commit bb7b7b0eb7cf64109f05136d921a357f58839ba1 Author: Jamie Gritton AuthorDate: 2024-06-24 20:03:45 +0000 Commit: Jamie Gritton CommitDate: 2024-06-28 19:49:28 +0000 MFC zfs/jail: Document the zfs.mount_snapshot parameter in jail(8). PR: 274263 Differential Revision: https://reviews.freebsd.org/D45647 (cherry picked from commit 63875db56bd545896e019c922378f96ad5adc892) --- usr.sbin/jail/jail.8 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8 index 0e98914795a2..3a6e46b065b2 100644 --- a/usr.sbin/jail/jail.8 +++ b/usr.sbin/jail/jail.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 26, 2023 +.Dd June 24, 2024 .Dt JAIL 8 .Os .Sh NAME @@ -761,7 +761,15 @@ the jail cannot perform any sysvmsg-related system calls. .It Va sysvsem, sysvshm Allow access to SYSV IPC semaphore and shared memory primitives, in the same manner as -.Va sysvmsg. +.Va sysvmsg . +.It Va zfs.mount_snapshot +Allow jailed users to access the contents of ZFS snapshots under the +filesystem's +.Pa .zfs +directory. +If +.Va allow.mount.zfs +is set, the snapshots may also be mounted. .El .Pp There are pseudo-parameters that are not passed to the kernel, but are