[oe-commits] Jonathan Liu : xserver-nodm-init: do not execute Xsession twice

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 305038f932fbcb39f3bb6698f8fad18172c30962
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=305038f932fbcb39f3bb6698f8fad18172c30962

Author: Jonathan Liu <net147 at gmail.com>
Date:   Wed Jun 12 08:30:15 2013 +0000

xserver-nodm-init: do not execute Xsession twice

The /etc/X11/Xserver script runs xinit /etc/X11/Xsession already so
there is no need to do /usr/bin/xinit /etc/X11/Xsession --
/etc/X11/Xserver. Having xinit nested will result in Xsession being
executed twice. To resolve this, just execute /etc/X11/Xserver directly
instead of going through xinit.

Signed-off-by: Jonathan Liu <net147 at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../xserver-nodm-init-2.0/xserver-nodm.service     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service
index 53e61d7..94d221e 100644
--- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service
@@ -3,7 +3,7 @@ Description=Xserver startup with a display manager
 
 [Service]
 EnvironmentFile=/etc/default/xserver-nodm
-ExecStart=/usr/bin/xinit /etc/X11/Xsession -- /etc/X11/Xserver
+ExecStart=/etc/X11/Xserver
 
 [Install]
 Alias=display-manager.service