lightningd: fix up installs in subdirectories. #7618
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
Lagrang3
reviewed
Aug 28, 2024
lightningd/lightningd.c
Outdated
| rel = path_rel(NULL, BINDIR, PKGLIBEXECDIR); | ||
| ld->subdaemon_dir = path_join(ld, my_path, take(rel)); | ||
|
|
||
| rel = path_rel(NULL, BINDIR, PLUGINDIR); |
There was a problem hiding this comment.
This works as long as the BINDIR and PLUGINDIR exist. Otherwise I get rel==NULL here.
Is realpath that checks if the path exists. Using path_simplify instead of path_canon inside path_rel would fix it, but that would not resolve symlinks, right?
Alternatively one could hardcode the relative path: ../libexec/c-lightning for subdaemons and ../libexec/c-lightning/plugins for plugins.
rustyrussell
force-pushed
the
handle-relative-installs
branch
2 times, most recently
from
895052d to
d7eb717
Compare
ShahanaFarooqui
force-pushed
the
handle-relative-installs
branch
from
d7eb717 to
e59d980
Compare
Commit a1fdeee "Makefile: clean up install path handling." broke the ability to configure with one path and then run in a different path. Turns out people actually do this! So, we have to use relative paths, compared to our existing binary. And we can't use path_rel, because that requires that the path exist (thanks @Lagrang3!). Fixes: ElementsProject#7595 Signed-off-by: Rusty Russell <[email protected]>
ShahanaFarooqui
force-pushed
the
handle-relative-installs
branch
from
e59d980 to
a0f7225
Compare
ShahanaFarooqui
added a commit
to ShahanaFarooqui/lightning
that referenced
this pull request
Aug 28, 2024
With PR ElementsProject#7618, Core Lightning installation with relative paths has been fixed and can be used again. Changelog-None.
|
ACK a0f7225 |
ShahanaFarooqui
added a commit
to ShahanaFarooqui/lightning
that referenced
this pull request
Aug 28, 2024
With PR ElementsProject#7618, Core Lightning installation with relative paths has been fixed and can be used again. Changelog-None.
ShahanaFarooqui
added a commit
that referenced
this pull request
Aug 29, 2024
With PR #7618, Core Lightning installation with relative paths has been fixed and can be used again. Changelog-None.
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 a1fdeee "Makefile: clean up install path handling." broke the ability to configure with one path and then run in a different path. Turns out people actually do this! So, we have to use relative paths, compared to our existing binary.
Fixes: #7595
Pull Request Title
Description
Please provide a brief summary of the changes made in this PR. What does it do, and why is it necessary?
Related Issues
List any related issues, bugs, or feature requests that are being addressed by this PR. Link them using GitHub's closing syntax (e.g.,
Closes #123).Changes Made
Checklist
Ensure the following tasks are completed before submitting the PR:
TODOshave been addressed or removed.Additional Notes
Any additional information or context about this PR that reviewers should know.