From 8f5f70b292652e73cbc6ec6f0181260254800cbd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Feb 2011 14:38:02 +0000 Subject: [PATCH] * We don't really need a display manager on the installation CD. Just log in as root automatically. svn path=/nixos/trunk/; revision=26014 --- modules/profiles/graphical.nix | 2 +- modules/services/x11/display-managers/auto.nix | 2 ++ tests/common/x11.nix | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/profiles/graphical.nix b/modules/profiles/graphical.nix index d714e142f73..1c279a73ac9 100644 --- a/modules/profiles/graphical.nix +++ b/modules/profiles/graphical.nix @@ -9,7 +9,7 @@ enable = true; autorun = true; defaultDepth = 24; - displayManager.kdm.enable = true; + displayManager.auto.enable = true; desktopManager.default = "kde4"; desktopManager.kde4.enable = true; }; diff --git a/modules/services/x11/display-managers/auto.nix b/modules/services/x11/display-managers/auto.nix index 507d24cd3ce..e2b1ee42e83 100644 --- a/modules/services/x11/display-managers/auto.nix +++ b/modules/services/x11/display-managers/auto.nix @@ -41,6 +41,8 @@ in config = mkIf cfg.enable { + services.xserver.displayManager.slim.enable = false; + services.xserver.displayManager.job = { execCmd = '' diff --git a/tests/common/x11.nix b/tests/common/x11.nix index fa8579d5ff8..c5a7c165d12 100644 --- a/tests/common/x11.nix +++ b/tests/common/x11.nix @@ -1,7 +1,6 @@ { services.xserver.enable = true; # Automatically log in. - services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.auto.enable = true; # Use IceWM as the window manager.