summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Lebl <jirka@5z.com>2001-08-04 23:18:08 +0000
committerGeorge Lebl <jirka@src.gnome.org>2001-08-04 23:18:08 +0000
commitbc835bab522b54f3a9770790835b224878312944 (patch)
tree7e7cdf6186829ffbc0b95308928a750619afd6d7
parentd08346e1be855097987e9ff953adee14c1ed14dd (diff)
downloadgdm-bc835bab522b54f3a9770790835b224878312944.tar.gz
run the scripts from /etc/X11/xinit/xinitrc.d which makes some more things
Sat Aug 04 19:36:42 2001 George Lebl <jirka@5z.com> * config/Gnome.in: run the scripts from /etc/X11/xinit/xinitrc.d which makes some more things work right
-rw-r--r--ChangeLog5
-rwxr-xr-xconfig/Gnome.in9
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cc0aa2b7..33229b74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug 04 19:36:42 2001 George Lebl <jirka@5z.com>
+
+ * config/Gnome.in: run the scripts from /etc/X11/xinit/xinitrc.d
+ which makes some more things work right
+
Fri Aug 3 12:51:58 2001 Owen Taylor <otaylor@redhat.com>
* daemon/slave.c (gdm_slave_exec_script): Set
diff --git a/config/Gnome.in b/config/Gnome.in
index fe575827..c294e1da 100755
--- a/config/Gnome.in
+++ b/config/Gnome.in
@@ -83,6 +83,15 @@ fi
unset XKB_IN_USE
+# 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
+
if [ -x "$HOME/.gnomerc" ]; then
exec "$HOME/.gnomerc"
else