blob: c48cb0743a2ece55e8e9a12a85c9785e9b8847de (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From 2dc0d268c7cc5d6133a9594adcd67dc543288b8f Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Tue, 2 Nov 2010 23:19:07 +0100
Subject: [PATCH 4/6] make custom session work
Gentoo bug: #216984
fix custom sessions not doing sourcing in the proper order.
---
data/Xsession.in | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/data/Xsession.in b/data/Xsession.in
index b2d98f2..0da187d 100755
--- a/data/Xsession.in
+++ b/data/Xsession.in
@@ -153,15 +153,6 @@ if [ -n "$GDM_LANG" ]; then
export LANG
fi
-# run all system xinitrc shell scripts.
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
- for i in /etc/X11/xinit/xinitrc.d/* ; do
- if [ -x "$i" -a ! -d "$i" ]; then
- . "$i"
- fi
- done
-fi
-
if [ "x$command" = "xcustom" ] ; then
if [ -x "$HOME/.xsession" ]; then
command="$HOME/.xsession"
@@ -189,6 +180,15 @@ if [ "x$command" = "xdefault" ] ; then
fi
fi
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+ for i in /etc/X11/xinit/xinitrc.d/* ; do
+ if [ -x "$i" ]; then
+ . "$i"
+ fi
+ done
+fi
+
# add ssh-agent if found
sshagent="`gdmwhich ssh-agent`"
if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
--
1.7.3.1
|
GitWeb
