summary refs log tree commit diff
path: root/nixos/modules/services/ttys
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-03-12 21:00:59 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-03-12 21:00:59 +0100
commitb13a5d4ccae1b38a1ba1c1a846d7528ba1227ec2 (patch)
tree685ccb5d8eb67ad6d38a24869cf7b79c87f16ffe /nixos/modules/services/ttys
parent238a98fcbec6f4dede9e78cba66811be33586b60 (diff)
downloadnixpkgs-b13a5d4ccae1b38a1ba1c1a846d7528ba1227ec2.tar
nixpkgs-b13a5d4ccae1b38a1ba1c1a846d7528ba1227ec2.tar.gz
nixpkgs-b13a5d4ccae1b38a1ba1c1a846d7528ba1227ec2.tar.bz2
nixpkgs-b13a5d4ccae1b38a1ba1c1a846d7528ba1227ec2.tar.lz
nixpkgs-b13a5d4ccae1b38a1ba1c1a846d7528ba1227ec2.tar.xz
nixpkgs-b13a5d4ccae1b38a1ba1c1a846d7528ba1227ec2.tar.zst
nixpkgs-b13a5d4ccae1b38a1ba1c1a846d7528ba1227ec2.zip
Fix kmscon evaluation
Diffstat (limited to 'nixos/modules/services/ttys')
-rw-r--r--nixos/modules/services/ttys/kmscon.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix
index 1857c69b76b..4bbc4259327 100644
--- a/nixos/modules/services/ttys/kmscon.nix
+++ b/nixos/modules/services/ttys/kmscon.nix
@@ -44,6 +44,7 @@ in {
       After=systemd-user-sessions.service
       After=plymouth-quit-wait.service
       After=systemd-logind.service
+      After=systemd-vconsole-setup.service
       Requires=systemd-logind.service
       Before=getty.target
       Conflicts=getty@%i.service
@@ -62,11 +63,9 @@ in {
       X-RestartIfChanged=false
     '';
 
-    systemd.units."autovt@.service".baseUnit = "${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service";
+    systemd.services."autovt@".baseUnit = "${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service";
 
-    systemd.services."systemd-vconsole-setup".restartIfChanged = false;
-
-    systemd.units."kmsconvt@tty1.service".extraConfig.wait-for-vconsole-setup = "After=systemd-vconsole-setup.service";
+    systemd.services.systemd-vconsole-setup.restartIfChanged = false;
 
     services.kmscon.extraConfig = mkIf cfg.hwRender ''
       drm