zfs-load-key.sh: ${ZFS} is not the zfs binary #9780
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
A change[1] was merged yesterday that should refer to the zfs binary in the initramfs, but is actually an unset shell variable. This commit changes this line to call `zfs` directly like the surrounding code. [1]: cb5b875 Signed-off-by: Ben Cordero <bencord0@condi.me>
behlendorf
approved these changes
Dec 28, 2019
rlaager
approved these changes
Dec 28, 2019
ghfields
approved these changes
Dec 28, 2019
Codecov Report
@@ Coverage Diff @@
## master #9780 +/- ##
========================================
- Coverage 80% 80% -<1%
========================================
Files 385 385
Lines 121475 121475
========================================
- Hits 96680 96618 -62
- Misses 24795 24857 +62
Continue to review full report at Codecov.
|
|
Ah, my bad, sorry about that. Good catch |
behlendorf
added
Status: Accepted
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Jan 2, 2020
A change[1] was merged yesterday that should refer to the zfs binary in the initramfs, but is actually an unset shell variable. This commit changes this line to call `zfs` directly like the surrounding code. [1]: cb5b875 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Garrett Fields <ghfields@gmail.com> Reviewed-by: Richard Laager <rlaager@wiktel.com> Signed-off-by: Ben Cordero <bencord0@condi.me> Closes openzfs#9780
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Jan 7, 2020
A change[1] was merged yesterday that should refer to the zfs binary in the initramfs, but is actually an unset shell variable. This commit changes this line to call `zfs` directly like the surrounding code. [1]: cb5b875 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Garrett Fields <ghfields@gmail.com> Reviewed-by: Richard Laager <rlaager@wiktel.com> Signed-off-by: Ben Cordero <bencord0@condi.me> Closes openzfs#9780
tonyhutter
pushed a commit
that referenced
this pull request
Jan 23, 2020
A change[1] was merged yesterday that should refer to the zfs binary in the initramfs, but is actually an unset shell variable. This commit changes this line to call `zfs` directly like the surrounding code. [1]: cb5b875 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Garrett Fields <ghfields@gmail.com> Reviewed-by: Richard Laager <rlaager@wiktel.com> Signed-off-by: Ben Cordero <bencord0@condi.me> Closes #9780
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
This change fixes the zfs-load-key.sh dracut script so that
zfs getcan retrieve the key location.Description
I think this line, committed yesterday, broke booting with zfs encryption passwords
https://github.com/zfsonlinux/zfs/pull/9764/files#diff-df72a4107f2673aa772b7d7acc9923f5R41
How Has This Been Tested?
Tested locally by rebuilding and booting my initramfs with this change applied ontop of today's master branch.
Types of changes
Checklist:
Signed-off-by.