From 5b7c90019251437ec8692ca8102613614a70b3bd Mon Sep 17 00:00:00 2001 From: Tor Hedin Brønner Date: Fri, 11 Oct 2019 20:07:16 +0200 Subject: nixos/gdm: do not restart on reload switch (#70357) Not entirely sure how this works, but this does seem to fix reload switch killing the current graphical session. --- nixos/modules/services/x11/display-managers/gdm.nix | 4 ++-- pkgs/desktops/gnome-3/core/gdm/default.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 3b4723ce9fe3..597fb57a1790 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -165,12 +165,12 @@ in "rc-local.service" "systemd-machined.service" "systemd-user-sessions.service" - "getty@tty1.service" + "getty@tty${gdm.initialVT}.service" "plymouth-quit.service" "plymouth-start.service" ]; systemd.services.display-manager.conflicts = [ - "getty@tty1.service" + "getty@tty${gdm.initialVT}.service" "plymouth-quit.service" ]; systemd.services.display-manager.onFailure = [ diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index b8a5d70e9d25..9d1602dfccd3 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -31,12 +31,14 @@ stdenv.mkDerivation rec { substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X" ''; + initialVT = "7"; + configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" "--with-plymouth=yes" "--enable-gdm-xsession" - # "--with-initial-vt=7" + "--with-initial-vt=${initialVT}" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-udevdir=$(out)/lib/udev" ]; -- cgit 1.4.1