diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-12-11 08:41:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-11 08:41:46 -0500 |
| commit | d3a9b098d5d7933c06d95445f6b9e2e3e58090c0 (patch) | |
| tree | b636178475965c78edf63f682162d60d30d2ff93 /nixos | |
| parent | 44fe29a624e6c07a6a49a436b31ab4f7e2f02369 (diff) | |
| parent | d04157fb98b7b006956c8c5ab0d70d48cb1fb9b2 (diff) | |
| download | nixpkgs-d3a9b098d5d7933c06d95445f6b9e2e3e58090c0.tar nixpkgs-d3a9b098d5d7933c06d95445f6b9e2e3e58090c0.tar.gz nixpkgs-d3a9b098d5d7933c06d95445f6b9e2e3e58090c0.tar.bz2 nixpkgs-d3a9b098d5d7933c06d95445f6b9e2e3e58090c0.tar.lz nixpkgs-d3a9b098d5d7933c06d95445f6b9e2e3e58090c0.tar.xz nixpkgs-d3a9b098d5d7933c06d95445f6b9e2e3e58090c0.tar.zst nixpkgs-d3a9b098d5d7933c06d95445f6b9e2e3e58090c0.zip | |
Merge pull request #75489 from hedning/gdm-only-default-with-auto
nixos/gdm: only set session on auto login
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/gdm.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 29a80aac6e6..095569fa08a 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -204,9 +204,12 @@ in cat - > /run/gdm/.config/gnome-initial-setup-done <<- EOF yes EOF - '' + optionalString hasDefaultUserSession '' - ${setSessionScript}/bin/set-session ${defaultSessionName} - ''; + '' + # TODO: Make setSessionScript aware of previously used sessions + # + optionalString hasDefaultUserSession '' + # ${setSessionScript}/bin/set-session ${defaultSessionName} + # '' + ; }; # Because sd_login_monitor_new requires /run/systemd/machines |