Skip to content

Commit

Permalink
display-manager: Require systemd-udev-settle.service
Browse files Browse the repository at this point in the history
It was already ordered after systemd-udev-settle.service, but that
doesn't do anything if no other units require
systemd-udev-settle.service. This was causing random failures during X
server startup, e.g.

machine# [   12.691372] display-manager[607]: (EE) open /dev/dri/card0: No such file or directory

http://hydra.nixos.org/build/41062823
  • Loading branch information
edolstra committed Oct 20, 2016
1 parent 87e8ff4 commit e6bcff4
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions nixos/modules/services/x11/xserver.nix
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,7 @@ in
{ description = "X11 Server";

after = [ "systemd-udev-settle.service" "local-fs.target" "acpid.service" "systemd-logind.service" ];
wants = [ "systemd-udev-settle.service" ];

restartIfChanged = false;

Expand Down

3 comments on commit e6bcff4

@groxxda
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😞

This reminds me that we should avoid udev-settle during bootup on systems that have neither lvm nor luks.

@edolstra
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, if you have a better solution that would be awesome.

@groxxda
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have not even started investigating, but I think I remember we always include lvm and luks (and both require udev-settle which in turn slows down bootup significantly)..
This probably warrants a change to the way we build our init1, right?

Concerning the actual change to xserver module in this commit: I think it's not a big deal at the moment. I hope it won't be needed for GDM / other DM on wayland but our support for that is still at the beginning.

Please sign in to comment.