Avoid using nullglob option and fix dracut-install #1762
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
github-actions
bot
added
i18n
This comment was marked as resolved.
This comment was marked as resolved.
pvalena
force-pushed
the
nullglob
branch
2 times, most recently
from
862001a to
5915072
Compare
When running dracut-install with '-o' (optional source), and nullglob at the same time, when all of the arguments evaluate <null>, dracut-install should not fail even when the source is not specified.
This reverts commit 3506476, to replace the implementation.
Avoid using shell options in findkeymap, instead of using a wrapper[*] to restore the previous options. Using mapfile and find to generate the list of files also has the benefit of being more readable in this case. [*] Reverted commit 3506476 Original issue description from Michal Hecko <[email protected]>: The findkeymap function manipulates the shell options and relies on restoring them using the trap. However, as the function might be called recursively, each recursive invocation changes the signal handler to its own. As the recursion is entered with shell options already modified, the changed trap handler is replaced with restoration to the modified shell options, not the original ones.
|
I've run some tests (automated & manual) and fixed the remaining issues. Testskeymapfile: https://gist.github.com/f6048df4d7f2a2d609974283a674b9fd |
|
Thanks! |
pvalena
added a commit
to pvalena/dracut
that referenced
this pull request
Jul 21, 2022
as there's a check for file existence (and it being a regular file), recommended in the scriplet and I think prefered. Related: dracutdevs#1762
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.
Glob is in most cases not expected to evaluate to null. To avoid unexpected failures, don't use the
nullgloboption.I've found no code (WRT the modifications applied) where nullglob is needed, as the variable is either checked explicitly by
[[ -f $file ]], or passed toinst_multiple -owhere the file string is actually expected instead. I think more code is actually expecting an invalid argument instead of missing one (f.e.cp), so this increases resiliency.Changes
nullgloboption usemapfile(recursion overwritestrapsetting)dracut-installnot to fail when-ois specified, but no source is specifiedChecklist
Additional
E.g., a PR which I don't think should be needed: msekletar/prefixdevname#1
Tests
keymapfile: https://gist.github.com/f6048df4d7f2a2d609974283a674b9fd
dracut-install: https://gist.github.com/07171bb36863394728852810b21c026f