diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2010-12-20 00:06:02 -0600 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-12-20 00:06:02 -0600 |
| commit | 3ad5434a883fe624931a3507ceb00a7d3f6dc24a (patch) | |
| tree | bf25d3196fe2921470c9e0f0d4d4cc7add692ed0 /system/gdm/patches | |
| parent | 3f7c858b5ceb1159496d6ae4660b335c28be4363 (diff) | |
| download | slackbuilds-3ad5434a883fe624931a3507ceb00a7d3f6dc24a.tar.gz | |
system/gdm: Don't start ssh-agent from gdm - this is user's job
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'system/gdm/patches')
| -rw-r--r-- | system/gdm/patches/do_not_start_ssh-agent.diff | 18 | ||||
| -rw-r--r-- | system/gdm/patches/make_xfce_default_session.diff | 11 |
2 files changed, 29 insertions, 0 deletions
diff --git a/system/gdm/patches/do_not_start_ssh-agent.diff b/system/gdm/patches/do_not_start_ssh-agent.diff new file mode 100644 index 0000000000..c437bdadf8 --- /dev/null +++ b/system/gdm/patches/do_not_start_ssh-agent.diff @@ -0,0 +1,18 @@ +diff -Nur gdm-2.20.11.orig//config/Xsession.in gdm-2.20.11/config/Xsession.in +--- gdm-2.20.11.orig//config/Xsession.in 2010-06-02 20:06:25.000000000 -0500 ++++ gdm-2.20.11/config/Xsession.in 2010-12-20 00:02:58.480225271 -0600 +@@ -213,14 +213,6 @@ + fi + fi + +-# add ssh-agent if found +-sshagent="`gdmwhich ssh-agent`" +-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then +- command="$sshagent -- $command" +-elif [ -z "$sshagent" ] ; then +- echo "$0: ssh-agent not found!" +-fi +- + echo "$0: Setup done, will execute: $command" + + eval exec $command diff --git a/system/gdm/patches/make_xfce_default_session.diff b/system/gdm/patches/make_xfce_default_session.diff new file mode 100644 index 0000000000..1b2fcc1ef9 --- /dev/null +++ b/system/gdm/patches/make_xfce_default_session.diff @@ -0,0 +1,11 @@ +--- a/etc/X11/gdm/custom.conf 2009-07-31 00:32:22.065895378 -0500 ++++ b/etc/X11/gdm/custom.conf 2009-07-31 00:32:38.975622851 -0500 +@@ -54,6 +54,8 @@ + + [daemon] + ++DefaultSession=xfce.desktop ++ + [security] + + [xdmcp] |