The branch main has been updated by jamie:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ae1a0648b05acf798816e7b83b3c10856de5c8e5
commit ae1a0648b05acf798816e7b83b3c10856de5c8e5
Author: Jamie Gritton <ja...@freebsd.org>
AuthorDate: 2024-09-19 19:49:01 +0000
Commit: Jamie Gritton <ja...@freebsd.org>
CommitDate: 2024-09-19 19:49:01 +0000
jail: unbreak the zfs.mount_snapshot option
The change of its description from integer to boolean didn't actually
change it to a boolean, but only made it impossible to set as either
a boolean or an integer.
Rather than make it work as a boolean parameter should, just revert
to the old (working) integer parameter, and change the documentation
to match.
PR: 274263
Reported by: andrew.hotlab at hotmail
---
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 2 +-
usr.sbin/jail/jail.8 | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c
b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c
index 23dc03cdac92..b96393df4626 100644
--- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c
+++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c
@@ -100,7 +100,7 @@ static struct zfs_jailparam zfs_jailparam0 = {
static int zfs_jailparam_slot;
SYSCTL_JAIL_PARAM_SYS_NODE(zfs, CTLFLAG_RW, "Jail ZFS parameters");
-SYSCTL_JAIL_PARAM(_zfs, mount_snapshot, CTLTYPE_INT | CTLFLAG_RW, "B",
+SYSCTL_JAIL_PARAM(_zfs, mount_snapshot, CTLTYPE_INT | CTLFLAG_RW, "I",
"Allow mounting snapshots in the .zfs directory for unjailed datasets");
SYSCTL_NODE(_vfs_zfs, OID_AUTO, version, CTLFLAG_RD, 0, "ZFS versions");
diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8
index 19e89ce661a9..881d07b1b626 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 12, 2024
+.Dd September 19, 2024
.Dt JAIL 8
.Os
.Sh NAME
@@ -789,8 +789,8 @@ Allow access to SYSV IPC semaphore and shared memory
primitives, in the
same manner as
.Va sysvmsg .
.It Va zfs.mount_snapshot
-Allow jailed users to access the contents of ZFS snapshots under the
-filesystem's
+When set to 1, jailed users may access the contents of ZFS snapshots
+under the filesystem's
.Pa .zfs
directory.
If
