diff options
author | Eric Bénard <eric@eukrea.com> | 2012-08-13 10:40:53 +0200 |
---|---|---|
committer | Eric Bénard <eric@eukrea.com> | 2012-08-13 10:40:53 +0200 |
commit | 6e434777018b81bbd7873e7278f05425de18558a (patch) | |
tree | 48242bcd4ffefbfd6d2e683207e1059c6285d16f /meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch | |
parent | 568b98668fdf11b17839e20cb917922b7d51acce (diff) | |
parent | bb03e3f1817fb6d61b1e5952274389ee6f9bbb0d (diff) | |
download | meta-openembedded-6e434777018b81bbd7873e7278f05425de18558a.tar.gz |
Merge branch 'denzil-next' into denzil
Diffstat (limited to 'meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch')
-rw-r--r-- | meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch index f5c2c786d..1782665b2 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch | |||
@@ -9,18 +9,15 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
9 | 1 files changed, 6 insertions(+), 0 deletions(-) | 9 | 1 files changed, 6 insertions(+), 0 deletions(-) |
10 | create mode 100644 X11/Xsession.d/90xXWindowManager | 10 | create mode 100644 X11/Xsession.d/90xXWindowManager |
11 | 11 | ||
12 | diff --git a/X11/Xsession.d/90xXWindowManager b/X11/Xsession.d/90xXWindowManager | 12 | Index: xserver-common-1.34/X11/Xsession.d/90xXWindowManager |
13 | new file mode 100644 | 13 | =================================================================== |
14 | index 0000000..3df8435 | 14 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
15 | --- /dev/null | 15 | +++ xserver-common-1.34/X11/Xsession.d/90xXWindowManager 2012-06-28 15:02:22.010521773 +0200 |
16 | +++ b/X11/Xsession.d/90xXWindowManager | 16 | @@ -0,0 +1,7 @@ |
17 | @@ -0,0 +1,6 @@ | ||
18 | +#!/bin/sh | ||
19 | +if [ -x $HOME/.Xsession ]; then | 17 | +if [ -x $HOME/.Xsession ]; then |
20 | + exec $HOME/.Xsession | 18 | + exec $HOME/.Xsession |
19 | +elif [ -x /usr/bin/x-session-manager ]; then | ||
20 | + exec /usr/bin/x-session-manager | ||
21 | +else | 21 | +else |
22 | + exec /usr/bin/x-window-manager | 22 | + exec /usr/bin/x-window-manager |
23 | +fi | 23 | +fi |
24 | -- | ||
25 | 1.7.8.5 | ||
26 | |||