alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/console: fix Before= on the systemd-vconsole-setup unit

Browse source 
Only set Before=display-manager.service if it is actually present.

On headless systems, `systemctl list-units --state not-found` will
otherwise show display-manager.service.

Reported-In: https://github.com/NixOS/nixpkgs/issues/88597
This commit is contained in:
Florian Klink 2020-12-12 21:19:24 +01:00
parent 3043fe5b84
commit 536988b35e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/config/console.nix
View file

@ -159,7 +159,8 @@ in
''; '';
systemd.services.systemd-vconsole-setup = systemd.services.systemd-vconsole-setup =
{ before = [ "display-manager.service" ]; {
before = optional config.services.xserver.enable "display-manager.service";
after = [ "systemd-udev-settle.service" ]; after = [ "systemd-udev-settle.service" ];
restartTriggers = [ vconsoleConf consoleEnv ]; restartTriggers = [ vconsoleConf consoleEnv ];
}; };