diff options
| author | Florian Klink <flokli@flokli.de> | 2021-01-02 11:04:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-02 11:04:14 +0100 |
| commit | 88738dd72d05ce6bcb7e5e2bb2ff0836d3cfa776 (patch) | |
| tree | 19f33a337ace0cacd07f843a351c67ba8cc94711 /nixos/modules/config/console.nix | |
| parent | 56bb1b0f7a33e5d487dc2bf2e846794f4dcb4d01 (diff) | |
| parent | 536988b35efbff449d0398319e13da09af8d0d5e (diff) | |
| download | nixpkgs-88738dd72d05ce6bcb7e5e2bb2ff0836d3cfa776.tar nixpkgs-88738dd72d05ce6bcb7e5e2bb2ff0836d3cfa776.tar.gz nixpkgs-88738dd72d05ce6bcb7e5e2bb2ff0836d3cfa776.tar.bz2 nixpkgs-88738dd72d05ce6bcb7e5e2bb2ff0836d3cfa776.tar.lz nixpkgs-88738dd72d05ce6bcb7e5e2bb2ff0836d3cfa776.tar.xz nixpkgs-88738dd72d05ce6bcb7e5e2bb2ff0836d3cfa776.tar.zst nixpkgs-88738dd72d05ce6bcb7e5e2bb2ff0836d3cfa776.zip | |
Merge pull request #106787 from flokli/console-optional-display-manager
nixos/console: fix Before= on the systemd-vconsole-setup unit
Diffstat (limited to 'nixos/modules/config/console.nix')
| -rw-r--r-- | nixos/modules/config/console.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix index b8d52d1a8fc..ab166760517 100644 --- a/nixos/modules/config/console.nix +++ b/nixos/modules/config/console.nix @@ -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 ]; }; |