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

Remove quotes from cryptsetupopts in 90crypt module #1529

Merged

Conversation

lapseofreason
Copy link
Contributor

Fixes a regression that prevents unlocking of a luks volume with a key file using the 90crypt module.

The reason for the regression is the incorrectly quoted variable $cryptsetupoptions that can contain multiple arguments separated by spaces.

Changes

  • Remove quotes from $cryptsetupopts in 90crypt module.

Fixes #1528

@github-actions github-actions bot added crypt Issues related to the crypt module modules Issue tracker for all modules labels Jun 8, 2021
@haraldh haraldh enabled auto-merge (rebase) June 8, 2021 16:51
Copy link
Collaborator

@johannbg johannbg left a comment

Choose a reason for hiding this comment

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

Your pr is failing both the commisery test and the shell linter test

To fix the commisery check change your commit msg
from
Remove quotes from cryptsetupopts in 90crypt module
to
fix(crypt): remove quotes from cryptsetupopts

You will need to disable the failing linter shell check ( Double quote to prevent globbing and word splitting) which get triggered when you remove the quotes for your change.

You can do so by adding the following line to the if/readkey statements

# shellcheck disable=SC2086

auto-merge was automatically disabled June 8, 2021 18:55

Head branch was pushed to by a user without write access

@lapseofreason lapseofreason force-pushed the fix-cryptsetupopts-90crypt branch from cab7737 to 19a0f22 Compare June 8, 2021 18:55
@lapseofreason
Copy link
Contributor Author

@johannbg Thanks for the pointers, I made the changes.

@johannbg johannbg self-requested a review June 8, 2021 19:28
@johannbg johannbg merged commit e0abf88 into dracutdevs:master Jun 8, 2021
@lapseofreason lapseofreason deleted the fix-cryptsetupopts-90crypt branch June 8, 2021 19:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
crypt Issues related to the crypt module modules Issue tracker for all modules
Projects
None yet
Development

Successfully merging this pull request may close these issues.

hang at boot due to cryptsetup error when using module 90crypt with rd.luks.key (regression)
3 participants