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

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 b2b65a0993904bddc021faa4df8305d90bb21a1b..5e55da29371ab04baa74ccfe0ffec366cb0f0f25 100644 (file)
--- 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 @@
 #!/bin/sh
 if [ -x $HOME/.Xsession ]; then
     exec $HOME/.Xsession
+elif [ -x /usr/bin/x-session-manager ]; then
+    exec /usr/bin/x-session-manager
 else
     exec /usr/bin/x-window-manager
 fi
-
-

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 2b263abdf3635115474d60780c593b3126e0ff9c..46b7484090d545aebd0ba9d7e869089e7add1cdb 100644 (file)
--- 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"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor"
-PR = "r23"
+PR = "r24"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}