-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
initramfs: Fix legacy mountpoint rootfs #14274
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Legacy mountpoint datasets should not pass `-o zfsutil` to `mount.zfs`. Fix the logic in `mount_fs()` to not forget we have a legacy mountpoint when checking for an `org.zol:mountpoint` userprop. Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
ghost
added
Status: Code Review Needed
Ready for review and testing
Component: Userspace
user space functionality
labels
Dec 9, 2022
behlendorf
approved these changes
Dec 9, 2022
ryao
approved these changes
Dec 11, 2022
behlendorf
added
Status: Accepted
Ready to integrate (reviewed, tested)
and removed
Status: Code Review Needed
Ready for review and testing
labels
Dec 12, 2022
ghost
deleted the
initramfs-legacy
branch
December 12, 2022 18:25
ghost
pushed a commit
to truenas/zfs
that referenced
this pull request
Dec 12, 2022
Legacy mountpoint datasets should not pass `-o zfsutil` to `mount.zfs`. Fix the logic in `mount_fs()` to not forget we have a legacy mountpoint when checking for an `org.zol:mountpoint` userprop. Reviewed-by: Richard Yao <ryao@gentoo.org> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ryan Moeller <ryan@iXsystems.com> Closes openzfs#14274 (cherry picked from commit 786ff6a)
ghost
mentioned this pull request
Dec 12, 2022
13 tasks
behlendorf
pushed a commit
that referenced
this pull request
Dec 14, 2022
Legacy mountpoint datasets should not pass `-o zfsutil` to `mount.zfs`. Fix the logic in `mount_fs()` to not forget we have a legacy mountpoint when checking for an `org.zol:mountpoint` userprop. Reviewed-by: Richard Yao <ryao@gentoo.org> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ryan Moeller <ryan@iXsystems.com> Closes #14274 (cherry picked from commit 786ff6a)
andrewc12
pushed a commit
to andrewc12/openzfs
that referenced
this pull request
Dec 17, 2022
Legacy mountpoint datasets should not pass `-o zfsutil` to `mount.zfs`. Fix the logic in `mount_fs()` to not forget we have a legacy mountpoint when checking for an `org.zol:mountpoint` userprop. Reviewed-by: Richard Yao <ryao@gentoo.org> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ryan Moeller <ryan@iXsystems.com> Closes openzfs#14274
This change seems to have broke the ability to mount root fs datasets where |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Component: Userspace
user space functionality
Status: Accepted
Ready to integrate (reviewed, tested)
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
Legacy mountpoint datasets should not pass
-o zfsutil
tomount.zfs
. The logic in the zfs initramfs script for this is broken because a reused variable is overwritten. This prevents booting systems where the root fs dataset has mountpoint=legacy.Description
Fix the logic in
mount_fs()
to not forget we have a legacy mountpoint when checking for anorg.zol:mountpoint
userprop.How Has This Been Tested?
Booted a VM with it.
Types of changes
Checklist:
Signed-off-by
.