Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/dbus: re-add a dummy socketActivated option #101409

Merged
merged 2 commits into from Oct 25, 2020
Merged

Conversation

@rycee
Copy link
Member

@rycee rycee commented Oct 22, 2020

An alternative to #101408. Also see #97801.

+ " any effect. The user D-Bus session is now always socket activated"
+ " and can safely be removed."
Copy link
Member

@cole-h cole-h Oct 24, 2020

Nit:

Suggested change
+ " any effect. The user D-Bus session is now always socket activated"
+ " and can safely be removed."
+ " any effect and can be safely removed: the user D-Bus session is"
+ " now always socket activated."

"is now always socket activated and can safely be removed" feels non-sequitur (the "safely be removed" does not apply to the "user D-Bus session", but instead to the option services.dbus.socketActivated).

Copy link
Member Author

@rycee rycee Oct 24, 2020

Thanks! Applied.

rycee added 2 commits Oct 24, 2020
If set, then issue a warning instead of an error as previously.
Since b08b0bc, the function actually
causes an assertion error, not a warning.
@gebner
Copy link
Member

@gebner gebner commented Oct 25, 2020

Ok, let's merge this instead of #101408. The more principled solution in #97023 seems to require a bit more work still.

@gebner gebner merged commit a8a018d into NixOS:master Oct 25, 2020
16 checks passed
@rycee rycee deleted the dbus-warning branch Jul 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants