BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Don't use /tmp/kdm as the home directory for the kdm user - sounds

Browse source 
insecure.
* Create /var/lib/kdm.
* In kdmrc, set BootManager to "Grub2" if we're using GRUB 2.

svn path=/nixos/trunk/; revision=27805
This commit is contained in:
Eelco Dolstra 2011-07-17 10:52:40 +00:00
parent 6e7ce112bb
commit 6490c6ba21
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/services/x11/display-managers/kdm.nix
View file

@ -1,4 +1,4 @@
{pkgs, config, ...}: { config, pkgs, ... }:
with pkgs.lib; with pkgs.lib;
@ -15,7 +15,7 @@ let
HaltCmd=${config.system.build.upstart}/sbin/halt HaltCmd=${config.system.build.upstart}/sbin/halt
RebootCmd=${config.system.build.upstart}/sbin/reboot RebootCmd=${config.system.build.upstart}/sbin/reboot
${optionalString (config.system.boot.loader.id == "grub") '' ${optionalString (config.system.boot.loader.id == "grub") ''
BootManager=Grub BootManager=${if config.boot.loader.grub.version == 2 then "Grub2" else "Grub"}
''} ''}
[X-*-Core] [X-*-Core]
@ -99,8 +99,11 @@ in
services.xserver.displayManager.job = services.xserver.displayManager.job =
{ execCmd = { 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; logsXsession = true;
}; };
@ -109,8 +112,7 @@ in
users.extraUsers = singleton users.extraUsers = singleton
{ name = "kdm"; { name = "kdm";
uid = config.ids.uids.kdm; uid = config.ids.uids.kdm;
description = "kdm user"; description = "KDM user";
home = "/tmp/kdm";
}; };
}; };