diff options
author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-10-11 20:07:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-11 20:07:16 +0200 |
commit | 5b7c90019251437ec8692ca8102613614a70b3bd (patch) | |
tree | 5b8198bc3081738ed7b3260cd45ca15d6db0077e | |
parent | fb5f649bc9879207a81c4d4e42f0d823385061e6 (diff) | |
download | nixlib-5b7c90019251437ec8692ca8102613614a70b3bd.tar nixlib-5b7c90019251437ec8692ca8102613614a70b3bd.tar.gz nixlib-5b7c90019251437ec8692ca8102613614a70b3bd.tar.bz2 nixlib-5b7c90019251437ec8692ca8102613614a70b3bd.tar.lz nixlib-5b7c90019251437ec8692ca8102613614a70b3bd.tar.xz nixlib-5b7c90019251437ec8692ca8102613614a70b3bd.tar.zst nixlib-5b7c90019251437ec8692ca8102613614a70b3bd.zip |
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.
-rw-r--r-- | nixos/modules/services/x11/display-managers/gdm.nix | 4 | ||||
-rw-r--r-- | 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" ]; |