[Nix-commits] SVN commit: nix - r27805 - nixos/trunk/modules/services/x11/display-managers

[Eelco Dolstra]

Author: eelco
Date: Sun Jul 17 10:52:40 2011
New Revision: 27805
URL: https://svn.nixos.org/websvn/nix/?rev=27805&sc=1

Log:
* Don't use /tmp/kdm as the home directory for the kdm user - sounds
  insecure.
* Create /var/lib/kdm.
* In kdmrc, set BootManager to "Grub2" if we're using GRUB 2.

Modified:
   nixos/trunk/modules/services/x11/display-managers/kdm.nix

Modified: nixos/trunk/modules/services/x11/display-managers/kdm.nix
==============================================================================
--- nixos/trunk/modules/services/x11/display-managers/kdm.nix   Sun Jul 17 
10:45:49 2011        (r27804)
+++ nixos/trunk/modules/services/x11/display-managers/kdm.nix   Sun Jul 17 
10:52:40 2011        (r27805)
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -15,7 +15,7 @@
       HaltCmd=${config.system.build.upstart}/sbin/halt
       RebootCmd=${config.system.build.upstart}/sbin/reboot
       ${optionalString (config.system.boot.loader.id == "grub") ''
-        BootManager=Grub
+        BootManager=${if config.boot.loader.grub.version == 2 then "Grub2" 
else "Grub"}
       ''}
 
       [X-*-Core]
@@ -99,8 +99,11 @@
   
     services.xserver.displayManager.job =
       { execCmd =
-          (optionalString (config.system.boot.loader.id == "grub") 
"PATH=${config.system.build.grub}/sbin:$PATH ") +
-          "KDEDIRS=${kdebase_workspace} exec ${kdebase_workspace}/bin/kdm 
-config ${kdmrc} -nodaemon";
+          ''
+            mkdir -p /var/lib/kdm
+            ${(optionalString (config.system.boot.loader.id == "grub") 
"PATH=${config.system.build.grub}/sbin:$PATH ") +
+              "KDEDIRS=${kdebase_workspace} exec ${kdebase_workspace}/bin/kdm 
-config ${kdmrc} -nodaemon"}
+          '';
         logsXsession = true;
       };
 
@@ -109,8 +112,7 @@
     users.extraUsers = singleton
       { name = "kdm";
         uid = config.ids.uids.kdm;
-        description = "kdm user";
-        home = "/tmp/kdm";
+        description = "KDM user";
       };
 
   };
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits