alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Start ssh-agent or gpg-agent even if called by kdm

Browse source 
svn path=/nixos/trunk/; revision=21100
This commit is contained in:
Yury G. Kudryashov 2010-04-15 15:46:47 +00:00
parent 916fbfa070
commit 4d39d70406
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/services/x11/display-managers/default.nix
View file

@ -21,9 +21,6 @@ let
'' ''
#! /bin/sh #! /bin/sh
# Handle being called by kdm.
if test "''${1:0:1}" = /; then eval exec "$1"; fi
# The first argument of this script is the session type. # The first argument of this script is the session type.
sessionType="$1" sessionType="$1"
if test "$sessionType" = default; then sessionType=""; fi if test "$sessionType" = default; then sessionType=""; fi
@ -60,6 +57,9 @@ let
exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType" exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
fi fi
# Handle being called by kdm.
if test "''${1:0:1}" = /; then eval exec "$1"; fi
# Load X defaults. # Load X defaults.
if test -e ~/.Xdefaults; then if test -e ~/.Xdefaults; then
${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults