summaryrefslogtreecommitdiffstats
path: root/meta/packages/xserver-kdrive-common
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-04-07 13:44:36 +0000
committerRoss Burton <ross@openedhand.com>2008-04-07 13:44:36 +0000
commitfeb437e6267b72c893127bc854df56c3fa69ce5c (patch)
treea37eb7ddc6e11725957c57b99af8f8f1aca84d6e /meta/packages/xserver-kdrive-common
parent5c3b29a03bcdbb901e6019a43c64956227e60d21 (diff)
downloadpoky-feb437e6267b72c893127bc854df56c3fa69ce5c.tar.gz
xserver-kdrive-common: try running x-session-manager on startup before x-window-manager
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4177 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xserver-kdrive-common')
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager4
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager
index b2b65a0993..5e55da2937 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager
@@ -1,8 +1,8 @@
1#!/bin/sh 1#!/bin/sh
2if [ -x $HOME/.Xsession ]; then 2if [ -x $HOME/.Xsession ]; then
3 exec $HOME/.Xsession 3 exec $HOME/.Xsession
4elif [ -x /usr/bin/x-session-manager ]; then
5 exec /usr/bin/x-session-manager
4else 6else
5 exec /usr/bin/x-window-manager 7 exec /usr/bin/x-window-manager
6fi 8fi
7
8
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index 2b263abdf3..46b7484090 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor" 4RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor"
5PR = "r23" 5PR = "r24"
6 6
7SRC_URI = "file://etc" 7SRC_URI = "file://etc"
8S = ${WORKDIR} 8S = ${WORKDIR}