From 536988b35efbff449d0398319e13da09af8d0d5e Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 12 Dec 2020 21:19:24 +0100
Subject: [PATCH] nixos/console: fix Before= on the systemd-vconsole-setup unit
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
---
nixos/modules/config/console.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix
index f662ed62d31d..374c23f13ef3 100644
--- a/nixos/modules/config/console.nix
+++ b/nixos/modules/config/console.nix
@@ -159,7 +159,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 ];
};