fix(dracut.sh): kmoddir does not handle trailing / #2237
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
Fixes dracutdevs#2236 +(/) only works in bash interactive mode. Using any non-interactive bash run simply doesn't remove anything. The solution is copied from dracut-lib.sh, trim().
|
Note: I've checked for similar code and found only: |
|
RHBZ for reference: https://bugzilla.redhat.com/show_bug.cgi?id=2173100# |
aafeijoo-suse
approved these changes
Feb 27, 2023
dtardon
reviewed
Feb 27, 2023
| @@ -1033,7 +1033,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) | |||
| ((stdloglvl < 0)) && stdloglvl=0 | |||
|
|
|||
| [[ $drivers_dir_l ]] && drivers_dir=$drivers_dir_l | |||
| drivers_dir="${drivers_dir%%+(/)}" | |||
| drivers_dir="${drivers_dir%"${drivers_dir##*[!/]}"}" | |||
There was a problem hiding this comment.
Alternatively, you could call normalize_path() on the dir. That also replaces multiple / inside the path by a single one, but I don't think that is a problem...
There was a problem hiding this comment.
Oh, I didn't know that exists. Probably a better solution.
LaszloGombos
pushed a commit
to LaszloGombos/dracut
that referenced
this pull request
Mar 24, 2023
dracutdevs#2237 Resolves: #2173100
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.
Fixes #2236
+(/) only works in bash interactive mode. Using any non-interactive bash run simply doesn't remove anything.
The solution is copied from dracut-lib.sh, trim().
Changes
Trailing / for kmoddir variable are now handled properly.
Checklist
Fixes #2236