From 4d39d70406add7ba1898cb4468dd910a960e523e Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 15 Apr 2010 15:46:47 +0000
Subject: [PATCH] Start ssh-agent or gpg-agent even if called by kdm

svn path=/nixos/trunk/; revision=21100
---
 modules/services/x11/display-managers/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 805016fe438f..acc724c8663a 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -21,9 +21,6 @@ let
     ''
       #! /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.
       sessionType="$1"
       if test "$sessionType" = default; then sessionType=""; fi
@@ -60,6 +57,9 @@ let
           exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
       fi
 
+      # Handle being called by kdm.
+      if test "''${1:0:1}" = /; then eval exec "$1"; fi
+
       # Load X defaults.
       if test -e ~/.Xdefaults; then
           ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults