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

initramfs: fix for mountpoint=legacy check #14604

Merged

Conversation

ofthesun9
Copy link
Contributor

Motivation and Context

in initramfs script, we need to use mount.zfs (and not mount.zfs -o zfsutils) for dataset where mountpoint=legacy.

eb823cb is adding this check but we need to do this before clearing the mountpoint variable.

Closes #14599

Description

Just moving "clear the mountpoint variable line" after the check.

How Has This Been Tested?

Tested on my system. I can boot my ZFS on root system without being dropped to the shell

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:

@behlendorf behlendorf requested a review from ryao March 10, 2023 17:41
@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Mar 10, 2023
@behlendorf
Copy link
Contributor

Can you please and your signed-off-by to this commit and force update the PR (git commit --amend -s).

We need to clear mountpoint only after checking it.

Signed-off-by: ofthesun9 <olivier@ofthesun.net>
@ofthesun9 ofthesun9 force-pushed the fix-initramfs-mountpoint-legacy branch from 2dd6b28 to cb0c004 Compare March 10, 2023 20:25
@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Mar 14, 2023
@behlendorf behlendorf merged commit 8b7342d into openzfs:master Mar 14, 2023
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Mar 14, 2023
We need to clear mountpoint only after checking it.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Signed-off-by: ofthesun9 <olivier@ofthesun.net>
Closes openzfs#14599
Closes openzfs#14604
behlendorf pushed a commit that referenced this pull request Mar 15, 2023
We need to clear mountpoint only after checking it.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Signed-off-by: ofthesun9 <olivier@ofthesun.net>
Closes #14599
Closes #14604
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Mar 17, 2023
We need to clear mountpoint only after checking it.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Signed-off-by: ofthesun9 <olivier@ofthesun.net>
Closes openzfs#14599
Closes openzfs#14604
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Mar 17, 2023
We need to clear mountpoint only after checking it.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Signed-off-by: ofthesun9 <olivier@ofthesun.net>
Closes openzfs#14599
Closes openzfs#14604
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Mar 17, 2023
We need to clear mountpoint only after checking it.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Signed-off-by: ofthesun9 <olivier@ofthesun.net>
Closes openzfs#14599
Closes openzfs#14604
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Mar 17, 2023
We need to clear mountpoint only after checking it.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Signed-off-by: ofthesun9 <olivier@ofthesun.net>
Closes openzfs#14599
Closes openzfs#14604
@ofthesun9 ofthesun9 deleted the fix-initramfs-mountpoint-legacy branch May 8, 2023 17:13
@ofthesun9 ofthesun9 restored the fix-initramfs-mountpoint-legacy branch May 8, 2023 17:13
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.

user dropped to shell if if boot dataset has mountpoint=legacy
3 participants