summary refs log tree commit diff
diff options
context:
space:
mode:
authorArchit Gupta <archit@accelbread.com>2023-06-30 13:15:53 -0700
committerArchit Gupta <archit@accelbread.com>2023-06-30 13:15:53 -0700
commit36ca205e44d839306b8ce1ba1c3f217d90d26738 (patch)
tree7fdddb735e83fd9a8960c776151769a89f3cc96e
parentb763c20eda8f768909ddafd85a6b7976439f4e3b (diff)
downloadnixpkgs-36ca205e44d839306b8ce1ba1c3f217d90d26738.tar
nixpkgs-36ca205e44d839306b8ce1ba1c3f217d90d26738.tar.gz
nixpkgs-36ca205e44d839306b8ce1ba1c3f217d90d26738.tar.bz2
nixpkgs-36ca205e44d839306b8ce1ba1c3f217d90d26738.tar.lz
nixpkgs-36ca205e44d839306b8ce1ba1c3f217d90d26738.tar.xz
nixpkgs-36ca205e44d839306b8ce1ba1c3f217d90d26738.tar.zst
nixpkgs-36ca205e44d839306b8ce1ba1c3f217d90d26738.zip
nixos/gdm: fix plymouth-quit bootup error message
If plymouth is not enabled, there is no plymouth-quit service created
otherwise, so setting systemd.services.plymouth-quit.wantedBy creates an
empty service which logs an error during bootup. The plymouth fix should
only be applied if plymouth is actually available to prevent a needless
systemd service error on systems with gdm but no plymouth (such as a
default gnome setup).
-rw-r--r--nixos/modules/services/x11/display-managers/gdm.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index f8f82bda3fa..676d08b93e2 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -207,7 +207,9 @@ in
     # conflicts display-manager.service, then when nixos-rebuild
     # switch starts multi-user.target, display-manager.service is
     # stopped so plymouth-quit.service can be started.)
-    systemd.services.plymouth-quit.wantedBy = lib.mkForce [];
+    systemd.services.plymouth-quit = mkIf config.boot.plymouth.enable {
+      wantedBy = lib.mkForce [];
+    };
 
     systemd.services.display-manager.serviceConfig = {
       # Restart = "always"; - already defined in xserver.nix