Author: eelco
Date: Thu Feb 17 14:38:02 2011
New Revision: 26014
URL: https://svn.nixos.org/websvn/nix/?rev=26014&sc=1
Log:
* We don't really need a display manager on the installation CD. Just
log in as root automatically.
Modified:
nixos/trunk/modules/profiles/graphical.nix
nixos/trunk/modules/services/x11/display-managers/auto.nix
nixos/trunk/tests/common/x11.nix
Modified: nixos/trunk/modules/profiles/graphical.nix
==============================================================================
--- nixos/trunk/modules/profiles/graphical.nix Thu Feb 17 13:57:15 2011
(r26013)
+++ nixos/trunk/modules/profiles/graphical.nix Thu Feb 17 14:38:02 2011
(r26014)
@@ -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;
};
Modified: nixos/trunk/modules/services/x11/display-managers/auto.nix
==============================================================================
--- nixos/trunk/modules/services/x11/display-managers/auto.nix Thu Feb 17
13:57:15 2011 (r26013)
+++ nixos/trunk/modules/services/x11/display-managers/auto.nix Thu Feb 17
14:38:02 2011 (r26014)
@@ -41,6 +41,8 @@
config = mkIf cfg.enable {
+ services.xserver.displayManager.slim.enable = false;
+
services.xserver.displayManager.job =
{ execCmd =
''
Modified: nixos/trunk/tests/common/x11.nix
==============================================================================
--- nixos/trunk/tests/common/x11.nix Thu Feb 17 13:57:15 2011 (r26013)
+++ nixos/trunk/tests/common/x11.nix Thu Feb 17 14:38:02 2011 (r26014)
@@ -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.
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
