fix(dracut-lib): only remove initqueue/finished scripts, not the hook dir #2623
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
… dir The `remove_hostonly_files` function should only remove (as its name suggests) hostonly configuration and files. The initqueue/finished scripts considered as hostonly that must be removed are added via `wait_for_dev`. But, the `hookdirs` are always created at build time, and should not be removed. This patch also allows to remove the `mkdir` workaround in the `network-manager` module (copied-pasted into the `connman` module after), and avoids having to add it tree-wide in many missing places. Fixes 87e90d7 Fixes dracutdevs#2620
github-actions
bot
added
modules
LaszloGombos
approved these changes
Feb 13, 2024
| @@ -1131,7 +1131,7 @@ show_memstats() { | |||
| } | |||
|
|
|||
| remove_hostonly_files() { | |||
| rm -fr /etc/cmdline /etc/cmdline.d/*.conf "$hookdir/initqueue/finished" | |||
| rm -fr /etc/cmdline /etc/cmdline.d/*.conf "$hookdir"/initqueue/finished/*.sh | |||
There was a problem hiding this comment.
Would it be possible to make this even more generic, e.g.
"$hookdir"/initqueue/finished/*
Merged
3 tasks
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.
The
remove_hostonly_filesfunction should only remove (as its name suggests) hostonly configuration and files. The initqueue/finished scripts considered as hostonly that must be removed are added viawait_for_dev. But, thehookdirsare always created at build time, and should not be removed.This patch also allows to remove the
mkdirworkaround in thenetwork-managermodule (copied-pasted into theconnmanmodule after), and avoids having to add it tree-wide in many missing places.Checklist
Fixes 87e90d7
Fixes #2620