Systemd mount generator: don't fail keyload from file if already loaded #10103
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
Previously the generated keyload units for encryption roots with keylocation=file://* didn't contain the code to detect if the key was already loaded and would be marked failed in such situations. Move the code to check whether the key is already loaded from keylocation=prompt handling to general key loading code. Signed-off-by: InsanePrawn <insane.prawny@gmail.com>
Codecov Report
@@ Coverage Diff @@
## master #10103 +/- ##
========================================
- Coverage 79% 79% -<1%
========================================
Files 385 385
Lines 122314 122314
========================================
- Hits 97013 97009 -4
- Misses 25301 25305 +4
Continue to review full report at Codecov.
|
rlaager
approved these changes
Mar 5, 2020
behlendorf
approved these changes
Mar 5, 2020
|
Thanks for the reviews!
I see. Do you want me to make those changes? I have no strong feelings towards either version; I thought a different variable name might help indicate the different levels of shells/escaping. |
|
I don’t have strong feelings about it either. It’s probably fine as is. |
behlendorf
added
Status: Accepted
|
I'll go ahead and merge this as is. |
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Apr 22, 2020
Previously the generated keyload units for encryption roots with keylocation=file://* didn't contain the code to detect if the key was already loaded and would be marked failed in such situations. Move the code to check whether the key is already loaded from keylocation=prompt handling to general key loading code. Reviewed-by: Richard Laager <rlaager@wiktel.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: InsanePrawn <insane.prawny@gmail.com> Closes openzfs#10103
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Apr 22, 2020
Previously the generated keyload units for encryption roots with keylocation=file://* didn't contain the code to detect if the key was already loaded and would be marked failed in such situations. Move the code to check whether the key is already loaded from keylocation=prompt handling to general key loading code. Reviewed-by: Richard Laager <rlaager@wiktel.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: InsanePrawn <insane.prawny@gmail.com> Closes openzfs#10103
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Apr 28, 2020
Previously the generated keyload units for encryption roots with keylocation=file://* didn't contain the code to detect if the key was already loaded and would be marked failed in such situations. Move the code to check whether the key is already loaded from keylocation=prompt handling to general key loading code. Reviewed-by: Richard Laager <rlaager@wiktel.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: InsanePrawn <insane.prawny@gmail.com> Closes openzfs#10103
tonyhutter
pushed a commit
that referenced
this pull request
May 12, 2020
Previously the generated keyload units for encryption roots with keylocation=file://* didn't contain the code to detect if the key was already loaded and would be marked failed in such situations. Move the code to check whether the key is already loaded from keylocation=prompt handling to general key loading code. Reviewed-by: Richard Laager <rlaager@wiktel.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: InsanePrawn <insane.prawny@gmail.com> Closes #10103
jsai20
pushed a commit
to jsai20/zfs
that referenced
this pull request
Mar 30, 2021
Previously the generated keyload units for encryption roots with keylocation=file://* didn't contain the code to detect if the key was already loaded and would be marked failed in such situations. Move the code to check whether the key is already loaded from keylocation=prompt handling to general key loading code. Reviewed-by: Richard Laager <rlaager@wiktel.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: InsanePrawn <insane.prawny@gmail.com> Closes openzfs#10103
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
Previously the generated keyload units for encryption roots with
keylocation=file://* didn't contain the code to detect if the key
was already loaded and would be marked failed in such situations.
This would lead to systemd marking the system as degraded, for example if an initcpio hook already loaded an encryption key in order to mount the rootfs.
-> No more red text during startup! (make sure not to boot with plymouth or the
quietkernel arg)Description
Move the code to check whether the key is already loaded
from keylocation=prompt handling to the general key loading code.
How Has This Been Tested?
Manually confirmed the resulting unit files behave correctly tolerate a key already being loaded.
Simple reproducer script here
Types of changes
Checklist:
Signed-off-by.