From 4a180dac60e066f52268b69820bafa89dc4ba0d3 Mon Sep 17 00:00:00 2001 From: Jonas Schwabe Date: Sat, 28 Oct 2017 15:35:57 +0200 Subject: gdm: fix restart of display-manager after nixos-rebuild - fix restart of display-manager due to a conflict with getty@tty1 - fixes #21439 --- nixos/modules/services/x11/display-managers/gdm.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'nixos/modules/services/x11/display-managers') diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 83c5c95dae7e..45a67ac040b8 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -125,7 +125,6 @@ in "getty@tty1.service" ]; - systemd.services.display-manager.conflicts = [ "getty@tty1.service" ]; systemd.services.display-manager.serviceConfig = { # Restart = "always"; - already defined in xserver.nix KillMode = "mixed"; -- cgit 1.4.1 From 440178d729efbc279a70c93495b6212db029f180 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 30 Oct 2017 21:43:10 +0100 Subject: gdm: don't start getty@tty1 if enabled --- nixos/modules/services/x11/display-managers/gdm.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'nixos/modules/services/x11/display-managers') diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 45a67ac040b8..e83f26516f5f 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -125,6 +125,8 @@ in "getty@tty1.service" ]; + systemd.services."getty@tty1".enable = false; + systemd.services.display-manager.conflicts = [ "getty@tty1.service" ]; systemd.services.display-manager.serviceConfig = { # Restart = "always"; - already defined in xserver.nix KillMode = "mixed"; -- cgit 1.4.1