Merge pull request #106787 from flokli/console-optional-display-manager

nixos/console: fix Before= on the systemd-vconsole-setup unit
This commit is contained in:
Florian Klink 2021-01-02 11:04:14 +01:00 committed by GitHub
commit 88738dd72d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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