rc: fix automatic restart with runlevel-specific conf.d files #640
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
thesamesam
reviewed
Jul 15, 2023
src/openrc/rc.c
Outdated
| @@ -528,6 +528,7 @@ runlevel_config(const char *service, const char *level) | |||
| bool retval; | |||
|
|
|||
| dir = dirname(init); | |||
| dir = dirname(dir); | |||
There was a problem hiding this comment.
I suggest putting a comment explaining what you've said in the commit message.
There was a problem hiding this comment.
Personally, I think this is fine. But maybe you can just skip the first assignment and chain the calls:
dir = dirname(dirname(init));Commit fc4f15d broke the automatic restart of services having runlevel-specific conf.d files. The double dirname() was not a mistake, but the way of getting from the service script in init.d to the upper directory containing the conf.d directory. dirname() modifies the argument in-place, so the second call operated on a modified value. To make it more obvious what is going on, have the second call operate on the returned value from the first call. Fixes: fc4f15d ("openrc: fix double-assignment to dir") Signed-off-by: Sven Wegener <[email protected]>
swegener
force-pushed
the
runlevel-specific-conf.d-restart
branch
from
9f7ad7a
to
0341a14
Compare
thesamesam
approved these changes
Jul 15, 2023
N-R-K
approved these changes
Jul 15, 2023
dwfreed
approved these changes
Jul 27, 2023
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.
Commit fc4f15d broke the automatic restart of services having runlevel-specific conf.d files.
The double dirname() is not a mistake, but the way of getting from the service script in init.d to the upper directory containing the conf.d directory. dirname() modifies the argument in-place, so the second call operated on a modified value. To make it more obvious what is going on, have the second call operate on the returned value from the first call.
Fixes: fc4f15d ("openrc: fix double-assignment to dir")