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: use correct dataset for rootfs on rollback=1 #12586

Merged
merged 1 commit into from
Oct 8, 2021

Conversation

nachtgeist
Copy link
Contributor

@nachtgeist nachtgeist commented Sep 24, 2021

When booting with root=zfs:rpool/myrootfs@foosnapshot rollback=1, myrootfs and its descendants get rolled back to foosnapshot, however ZFS_BOOTFS still contains myrootfs@foosnapshot instead of the actually desired value of myrootfs.

fixes #12585

How Has This Been Tested?

Tested on Debian VMs using buster and bullseye (current stable and oldstable)

  • specify the aforementioned kernel cmdline parameters
  • enjoy a rootfs which has been correctly rolled back

Types of changes

  • [x ] Bug fix (non-breaking change which fixes an issue)

Copy link
Contributor

@behlendorf behlendorf left a comment

Choose a reason for hiding this comment

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

Thanks, this looks good to me.

@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Sep 28, 2021
@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Oct 6, 2021
@jwk404
Copy link
Contributor

jwk404 commented Oct 6, 2021

@nachtgeist this looks good to me. Could you please force push once more, with a signed-off-by line in your commit message? Checkstyle won't pass without it.

@behlendorf behlendorf merged commit a5b4642 into openzfs:master Oct 8, 2021
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.

initramfs: wrong dataset used for rootfs when rollback=1
3 participants