Handle the priority field correctly when a value is explicitly set #9
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
anatol
requested changes
Nov 6, 2022
| highPrio = append(highPrio, i) | ||
| } else { | ||
| } else if k.Priority == nil || *k.Priority == 1 { |
There was a problem hiding this comment.
Could you please add a testcase for this bug to luks2_test.go? It should be a one-liner something like
func TestLuks2PreferedPriority(t *testing.T) {
runLuks2Test(t, 0, "--priority", "prefer")
}There was a problem hiding this comment.
Good idea. It turns out luksFormat doesn't interpret the the --priority flag, but I added a test that runs an additional config command.
This resolves an error: json: cannot unmarshal number into Go struct field keyslot.keyslots.priority of type string
msiegen
commented
Nov 7, 2022
|
Looks good. Thank you for this contribution. |
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.
I encountered the error
json: cannot unmarshal number into Go struct field keyslot.keyslots.priority of type stringwhen trying to unlock a volume that had had one of its keyslots boosted in priority with
cryptsetup config --priority prefer --key-slot 1 /dev/sda3.This commit resolves it by using a pointer field to expose presence information.