diff options
author | Ross Burton <ross@openedhand.com> | 2008-04-07 13:44:36 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2008-04-07 13:44:36 +0000 |
commit | feb437e6267b72c893127bc854df56c3fa69ce5c (patch) | |
tree | a37eb7ddc6e11725957c57b99af8f8f1aca84d6e /meta | |
parent | 5c3b29a03bcdbb901e6019a43c64956227e60d21 (diff) | |
download | openembedded-core-feb437e6267b72c893127bc854df56c3fa69ce5c.tar.gz openembedded-core-feb437e6267b72c893127bc854df56c3fa69ce5c.tar.bz2 openembedded-core-feb437e6267b72c893127bc854df56c3fa69ce5c.tar.xz openembedded-core-feb437e6267b72c893127bc854df56c3fa69ce5c.zip |
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')
-rw-r--r-- | meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager | 4 | ||||
-rw-r--r-- | meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb | 2 |
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 b2b65a099..5e55da293 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 @@ #!/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 2b263abdf..46b748409 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" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor" -PR = "r23" +PR = "r24" SRC_URI = "file://etc" S = ${WORKDIR} |