Patchwork [meta-oe] xserver-nodm-init: do not execute Xsession twice

login
register
mail settings
Submitter Jonathan Liu
Date June 12, 2013, 8:30 a.m.
Message ID <1371025815-2776-1-git-send-email-net147@gmail.com>
Download mbox | patch
Permalink /patch/51579/
State Accepted, archived
Commit 305038f932fbcb39f3bb6698f8fad18172c30962
Headers show

Comments

Jonathan Liu - June 12, 2013, 8:30 a.m.
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@gmail.com>
---
 .../xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

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