summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-01-20 15:21:31 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-01-20 15:21:31 +0000
commitbc8d0a163f8766be261193ef71a929c0e05fd0dd (patch)
tree0779cfbf9344a09616d5723d430ba5de65a8540c /x11-base
parentupdated to use new session scheme (diff)
downloadhistorical-bc8d0a163f8766be261193ef71a929c0e05fd0dd.tar.gz
historical-bc8d0a163f8766be261193ef71a929c0e05fd0dd.tar.bz2
historical-bc8d0a163f8766be261193ef71a929c0e05fd0dd.zip
small fix
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xfree/files/4.2.0-r1/xinitrc6
1 files changed, 5 insertions, 1 deletions
diff --git a/x11-base/xfree/files/4.2.0-r1/xinitrc b/x11-base/xfree/files/4.2.0-r1/xinitrc
index 0d756d2d4f51..04821ff6466d 100644
--- a/x11-base/xfree/files/4.2.0-r1/xinitrc
+++ b/x11-base/xfree/files/4.2.0-r1/xinitrc
@@ -24,7 +24,11 @@ if [ -f $usermodmap ]; then
xmodmap $usermodmap
fi
-if [ -n "`/etc/X11/chooser.sh`" ]; then
+# handle xinit
+if [ -f "$HOME/.xinitrc" ]; then
+ XINITRC="$HOME/.xinitrc"
+ exec /bin/sh "$HOME/.xinitrc"
+elif [ -n "`/etc/X11/chooser.sh`" ]; then
exec "`/etc/X11/chooser.sh`"
else
# start some nice programs