Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix per-jail zfs.mount_snapshot setting #14509

Merged
merged 1 commit into from
Feb 22, 2023

Conversation

allanjude
Copy link
Contributor

Sponsored-by: Modirum MDPay
Sponsored-by: Klara, Inc.

Motivation and Context

jsys = -1 (no matching parameters) and jsys = JAIL_SYS_INHERIT were being treated the same when they should not have been.

This meant that when jail.conf set the nopersist flag (for some reason as a second stop) during startup, it was incorrectly destroying the per-jail ZFS settings.

Description

How Has This Been Tested?

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

When jail.conf set the nopersist flag during startup, it was
incorrectly destroying the per-jail ZFS settings.

Sponsored-by: Modirum MDPay
Sponsored-by: Klara, Inc.
Signed-off-by: Allan Jude <allan@klarasystems.com>
Copy link
Contributor

@mmatuska mmatuska left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I confirm the patch working.

@ghost ghost added the Status: Accepted Ready to integrate (reviewed, tested) label Feb 21, 2023
@behlendorf behlendorf merged commit 1d56c6d into openzfs:master Feb 22, 2023
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Mar 3, 2023
When jail.conf set the nopersist flag during startup, it was
incorrectly destroying the per-jail ZFS settings.

Reported-by: Martin Matuska <mm@FreeBSD.org>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: Allan Jude <allan@klarasystems.com>
Sponsored-by: Modirum MDPay
Sponsored-by: Klara, Inc.
Closes openzfs#14509
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants