Make socket activated user dbus session mandatory #97801

rycee · 2020-09-11T20:29:41Z

Motivation for this change

Removes non-socket activated user D-Bus session. To do this it was also necessary to add a hook that moves systemd user units to a place discoverable through XDG_DATA_DIRS. Replaces #67942.

Many CPU hours have died to bring us these two commits.

rycee · 2020-09-11T20:30:26Z

I'll add a note to the 21.03 release notes when the file is added.

worldofpeace · 2020-09-12T00:56:28Z

I think in xserver.nix we still do startDbusSession

xaverdh · 2020-09-12T06:38:53Z

I'll add a note to the 21.03 release notes when the file is added.

https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2103.xml is already there actually

pkgs/build-support/setup-hooks/move-systemd-user-units.sh

rycee · 2020-09-12T12:01:42Z

@worldofpeace The PR also removes the services.xserver.startDbusSession option since it indeed is obsolete once dbus is socket activated.

@xaverdh Cool, I'll update the PR.

pbogdan · 2020-09-12T14:26:35Z

pkgs/build-support/setup-hooks/move-systemd-user-units.sh

@@ -0,0 +1,25 @@
+#!/run/current-system/sw/bin/bash


Is the shebang here necessary at all? Does it work in a sandboxed build or non-sandboxed build on non-NixOS?

No, the shebang is not serving any function beside helping the editor and shellcheck detect that the code is expected to be Bash compatible.

I changed to a more generic #!/usr/bin/env bash line, though, that is probably more familar.

This hook moves systemd user service file from `lib/systemd/user` to `share/systemd/user`. This is to allow systemd to find the user services when installed into a user profile. The `lib/systemd/user` path does not work since `lib` is not in `XDG_DATA_DIRS`.

Ericson2314

Looks good. Maybe change the wording to make clear dbus is socket-activated if it is enabled at all, so no one thinks you made dbus uncondititonal?

worldofpeace

LGTM yay!

rycee · 2020-09-12T17:38:19Z

@Ericson2314 Yes, that's a good idea. I'll make that change, just waiting for everything to rebuild (again 😉).

This removes the `services.dbus.socketActivated` and `services.xserver.startDbusSession` options. Instead the user D-Bus session is always socket activated.

rycee · 2020-09-13T09:35:21Z

@Ericson2314 Done.

rycee · 2020-09-15T20:40:59Z

Thanks for the merge @worldofpeace. It'll be very nice to be able to rely on people having a functional dbus even in non-graphical logins 😀

bb010g · 2020-09-15T21:33:38Z

How likely is this PR landing in 20.09?

cole-h · 2020-09-15T21:35:27Z

Unlikely, considering branch-off happened last week.

rycee · 2020-09-15T21:38:04Z

@bb010g I would be very much against trying to get this into 20.09. Since it involves a stdenv change I haven't been able to comprehensive test due to the amount of rebuilds necessary (https://nixbuild.net/ has helped a lot but still it is a slow process) so I imagine there might be some cases that have not been covered. It will absolutely have to stabilize in staging-next and master for some time.

gebner · 2020-10-20T08:46:26Z

This change makes it very hard to have the same configuration for unstable and stable. Could we at least make services.dbus.socketActivated = true; a warning instead of a hard error?

worldofpeace · 2020-10-22T15:51:26Z

This change makes it very hard to have the same configuration for unstable and stable. Could we at least make services.dbus.socketActivated = true; a warning instead of a hard error?

This PR used mkRemovedOptionModule, which as described in modules.nix

Return a module that causes a warning to be shown if the
specified option is defined

should not throw a hard error. Can you please paste a trace etc.?

gebner · 2020-10-22T16:17:10Z

This change makes it very hard to have the same configuration for unstable and stable. Could we at least make services.dbus.socketActivated = true; a warning instead of a hard error?

This PR used mkRemovedOptionModule, which as described in modules.nix
Return a module that causes a warning to be shown if the
specified option is defined
should not throw a hard error. Can you please paste a trace etc.?

let

  configuration = { config, pkgs, ... }: {
    services.dbus.socketActivated = true;
  };

  nixos = import <nixpkgs/nixos> { configuration = configuration; };

in nixos.vm

$ nix-build foo.nix
error:
Failed assertions:
- The option definition `services.dbus.socketActivated' in `<unknown-file>' no longer has any effect; please remove it.
The user D-Bus session is now always socket activated and this option can safely be removed.

(use '--show-trace' to show detailed location information)

gebner · 2020-10-22T18:11:06Z

I've made a PR: #101408

rycee · 2020-10-24T09:13:53Z

And I made an alternative PR #101409 that turns this specific dbus assertion error into a warning. Please have a look.

This makes the systemd module use the sd-switch application to perform the unit switch during a generation activation. Since the closure of sd-switch is relatively lightweight we unconditionally pull it in as a dependency. We simultaneously remove the `systemd.user.startServices` option and perform the switch action automatically. This is the second attempt at introducing this change, the first being 9c0fe39, which was quickly reverted 223e3c3 since the feature didn't work on systems where the user is not given a functional dbus session. Since the user session is now always socket activated, see [0], we can (hopefully) safely reintroduce the feature. [0] NixOS/nixpkgs#97801

rycee requested review from Ericson2314 and matthewbauer as code owners September 11, 2020 20:29

ofborg bot added 6.topic: nixos 6.topic: stdenv Standard environment 8.has: documentation 8.has: module (update) 10.rebuild-linux-stdenv 10.rebuild-darwin: 0 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ labels Sep 11, 2020

Mic92 reviewed Sep 12, 2020

View reviewed changes

pkgs/build-support/setup-hooks/move-systemd-user-units.sh Outdated Show resolved Hide resolved

rycee force-pushed the user-session-dbus2 branch 3 times, most recently from b4e956e to a6feaa5 Compare September 12, 2020 12:31

ofborg bot added the 8.has: changelog label Sep 12, 2020

pbogdan reviewed Sep 12, 2020

View reviewed changes

rycee force-pushed the user-session-dbus2 branch from a6feaa5 to a1d5df6 Compare September 12, 2020 16:30

Ericson2314 approved these changes Sep 12, 2020

View reviewed changes

worldofpeace approved these changes Sep 12, 2020

View reviewed changes

worldofpeace requested a review from jtojnar September 12, 2020 17:31

nixos/dbus: always use socket activates user session

f292a27

This removes the `services.dbus.socketActivated` and `services.xserver.startDbusSession` options. Instead the user D-Bus session is always socket activated.

rycee force-pushed the user-session-dbus2 branch from a1d5df6 to f292a27 Compare September 13, 2020 09:17

worldofpeace approved these changes Sep 13, 2020

View reviewed changes

worldofpeace merged commit 4085eee into NixOS:staging Sep 14, 2020

rycee deleted the user-session-dbus2 branch September 15, 2020 20:36

rycee mentioned this pull request Oct 22, 2020

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

Merged

rycee mentioned this pull request Nov 22, 2020

systemd: use sd-switch nix-community/home-manager#1618

Closed

5 tasks

archseer mentioned this pull request Dec 4, 2020

sway module is not enabling dbus properly nix-community/home-manager#1370

Closed

This was referenced Dec 4, 2020

Gnome terminal with systemd dbus nix-community/home-manager#1234

Closed

dbus-update-activation-environment is broken #17943

Closed

kira-bruneau mentioned this pull request May 13, 2021

Cannot override systemd user units in NixOS #122870

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make socket activated user dbus session mandatory #97801

Make socket activated user dbus session mandatory #97801

rycee commented Sep 11, 2020 •

edited

rycee commented Sep 11, 2020

worldofpeace commented Sep 12, 2020

xaverdh commented Sep 12, 2020

rycee commented Sep 12, 2020

pbogdan Sep 12, 2020

rycee Sep 12, 2020

Ericson2314 left a comment

worldofpeace left a comment

rycee commented Sep 12, 2020

rycee commented Sep 13, 2020

rycee commented Sep 15, 2020

bb010g commented Sep 15, 2020

cole-h commented Sep 15, 2020

rycee commented Sep 15, 2020 •

edited

gebner commented Oct 20, 2020

worldofpeace commented Oct 22, 2020

gebner commented Oct 22, 2020

gebner commented Oct 22, 2020

rycee commented Oct 24, 2020

Make socket activated user dbus session mandatory #97801

Make socket activated user dbus session mandatory #97801

Conversation

rycee commented Sep 11, 2020 • edited

Motivation for this change

rycee commented Sep 11, 2020

worldofpeace commented Sep 12, 2020

xaverdh commented Sep 12, 2020

rycee commented Sep 12, 2020

pbogdan Sep 12, 2020

Choose a reason for hiding this comment

rycee Sep 12, 2020

Choose a reason for hiding this comment

Ericson2314 left a comment

Choose a reason for hiding this comment

worldofpeace left a comment

Choose a reason for hiding this comment

rycee commented Sep 12, 2020

rycee commented Sep 13, 2020

rycee commented Sep 15, 2020

bb010g commented Sep 15, 2020

cole-h commented Sep 15, 2020

rycee commented Sep 15, 2020 • edited

gebner commented Oct 20, 2020

worldofpeace commented Oct 22, 2020

gebner commented Oct 22, 2020

gebner commented Oct 22, 2020

rycee commented Oct 24, 2020

rycee commented Sep 11, 2020 •

edited

rycee commented Sep 15, 2020 •

edited