summaryrefslogtreecommitdiff
path: root/testing/xorg-xdm/Xsession-xsm.patch
blob: a2d4d6cc6616b54074f1a9877d59464496415c0d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
diff -Naur xdm-1.1.8-orig/config/Xsession.cpp xdm-1.1.8/config/Xsession.cpp
--- xdm-1.1.8-orig/config/Xsession.cpp	2008-05-21 14:08:45.000000000 -0400
+++ xdm-1.1.8/config/Xsession.cpp	2009-04-28 02:56:11.000000000 -0400
@@ -54,6 +54,7 @@
 
 startup=$HOME/.xsession
 resources=$HOME/.Xresources
+xinitrc=$HOME/.xinitrc
 
 if [ -s "$startup" ]; then
 	if [ -x "$startup" ]; then
@@ -83,5 +84,9 @@
                 exec `eval $XDESKTOP`
         }
 #endif
-	exec BINDIR/xsm
+	if [ -r "$xinitrc" ]; then
+		exec /bin/sh -ls -c "$xinitrc"
+	else
+		exec /bin/sh -l /etc/X11/xinit/xinitrc
+        fi
 fi