mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-20 20:19:39 +03:00
Start ssh-agent or gpg-agent even if called by kdm
svn path=/nixos/trunk/; revision=21100
This commit is contained in:
parent
916fbfa070
commit
4d39d70406
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user