Repository navigation
Conversation
Fixes regression introduced by 33dd57e. Co-Authored-By: Claude Sonnet 4.6Signed-off-by: Joel Low
lowjoel
force-pushed
the
fix-zfs-initramfs
branch
from
April 18, 2026 02:27
edd9fd4 to
8e74b45
Compare
There was a problem hiding this comment.
Pull request overview
Fixes initramfs ZFS boot script regressions introduced by recent refactors, primarily around using the correct identifiers when destroying datasets and when prompting for a snapshot during snapshot-boot flows.
Changes:
- Fix
destroy_fs()to consistently use its local_destroy_fsargument when logging and constructing the destroy command. - Fix snapshot selection to update
_boot_snap(the variable actually used later) when prompting the user. - Fix dataset destruction loop to destroy each listed dataset (
fs) rather than repeatedly destroying_boot_snap.
Comments suppressed due to low confidence (1)
contrib/initramfs/scripts/zfs:681
- The comment about splitting the snapshot still refers to
${snap}, but the actual variable used here is_boot_snap. Updating the comment (and fixing “it's”→“its”) would avoid confusion when maintaining this function.
_boot_snap="$(ask_user_snap "${_boot_snap%%@*}")"
fi
# Separate the full snapshot ('${snap}') into it's filesystem and
# snapshot names. Would have been nice with a split() function..
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Fixes regression introduced by 61ab032. Co-Authored-By: Claude Sonnet 4.6Signed-off-by: Joel Low
lowjoel
force-pushed
the
fix-zfs-initramfs
branch
from
April 18, 2026 02:42
8e74b45 to
ea6475d
Compare
Contributor
Author
|
zloop failures hopefully are unrelated: don't believe an initramfs change can change zloop results |
behlendorf
approved these changes
Apr 20, 2026
behlendorf
left a comment
Contributor
There was a problem hiding this comment.
Thanks for fixing this up. Yeah, the zloop failure is unrelated.
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
May 11, 2026
Fixes regression introduced by 61ab032. Reviewed-by: Brian BehlendorfCo-Authored-By: Claude Sonnet 4.6 Signed-off-by: Joel Low Closes openzfs#18442
lundman
pushed a commit
to openzfsonosx/openzfs-fork
that referenced
this pull request
Jul 30, 2026
Fixes regression introduced by 33dd57e. Reviewed-by: Brian BehlendorfCo-Authored-By: Claude Sonnet 4.6 Signed-off-by: Joel Low Closes openzfs#18442
lundman
pushed a commit
to openzfsonosx/openzfs-fork
that referenced
this pull request
Jul 30, 2026
Fixes regression introduced by 61ab032. Reviewed-by: Brian BehlendorfCo-Authored-By: Claude Sonnet 4.6 Signed-off-by: Joel Low Closes openzfs#18442
pull Bot
pushed a commit
to A-Archives-and-Forks/openzfs
that referenced
this pull request
Sep 26, 2026
Fixes regression introduced by 33dd57e. Reviewed-by: Brian BehlendorfCo-Authored-By: Claude Sonnet 4.6 Signed-off-by: Joel Low Closes openzfs#18442
pull Bot
pushed a commit
to A-Archives-and-Forks/openzfs
that referenced
this pull request
Sep 26, 2026
Fixes regression introduced by 61ab032. Reviewed-by: Brian BehlendorfCo-Authored-By: Claude Sonnet 4.6 Signed-off-by: Joel Low Closes openzfs#18442
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
I was porting my zsys patches on my PPA and was running the resulting code changes by Claude for a review. Some changes were only in my patch, others were found to be in the upstream repository. Pushing those fixes here. I've also added the Co-authored-by tag (hopefully in compliance with policy). The problems were identified by Claude but I did the fixes by hand.
Description
See individual commits. They fix some identifier mix-ups in 61ab032 and 33dd57e.
This should also be a candidate for backporting to 2.4.x
How Has This Been Tested?
Mostly by static analysis of the comments and context. I've rebooted my machine with the new initramfs and cursorily it seems to work. Arguably, that won't tell us what we already know -- that this only affects the rollback path.
Types of changes
Checklist:
Signed-off-by.