summaryrefslogtreecommitdiff
path: root/data/Xsession.in
diff options
context:
space:
mode:
authorHalton Huo <halton.huo@sun.com>2010-01-12 11:52:19 -0500
committerRay Strode <rstrode@redhat.com>2010-01-12 11:52:19 -0500
commita998fc72ac782353fa2378c51221d369ac2686d4 (patch)
treec3ff8eb7411aaa03aa0097cd3e17ef3486a7fc45 /data/Xsession.in
parent1d693eff2060e5db07b09323fd14fdb582e1ec9e (diff)
downloadgdm-a998fc72ac782353fa2378c51221d369ac2686d4.tar.gz
Ignore execute subfolders under /etc/X11/xinit/xinitrc.d/
https://bugzilla.gnome.org/show_bug.cgi?id=606609
Diffstat (limited to 'data/Xsession.in')
-rwxr-xr-xdata/Xsession.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/Xsession.in b/data/Xsession.in
index d9720566..6c7761a4 100755
--- a/data/Xsession.in
+++ b/data/Xsession.in
@@ -180,7 +180,7 @@ 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
+ if [ -x "$i" -a ! -d "$i" ]; then
. "$i"
fi
done