This repository was archived by the owner on Sep 24, 2020. It is now read-only.
Revert "sd-bus: do not connect to dbus-1 socket when kdbus is available" #27
Conversation
This file contains hidden or 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
This reverts commit 1544291.
|
lgtm |
1 similar comment
|
lgtm |
Author
|
Fixes coreos/bugs#863. |
crawford
added a commit
that referenced
this pull request
Dec 3, 2015
Revert "sd-bus: do not connect to dbus-1 socket when kdbus is available"
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
This reverts commit 1544291.
The patch this reverts has flawed logic which ended up being fixed by systemd@751090c. Both patches depend on
bus_container_connect_kernel()returning specific error codes (e.g.-ENOENTor-ESOCKTNOSUPPORT), but oddly enough, that functionality didn't exist until systemd@80b0d3e (here and here). Rather than backporting all of those changes (and probably breaking more stuff), use the previous behavior and allow sd-bus to fall back from a kernel connection to a unix socket.Fixes coreos/bugs#1002.