From bbe4e39988e3aedcb6bf83f832a96fa13512dbc0 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Wed, 12 Jun 2013 08:30:15 +0000 Subject: [PATCH] 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. (From meta-openembedded rev: 305038f932fbcb39f3bb6698f8fad18172c30962) Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- .../xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openembedded/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service b/meta-openembedded/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service index 53e61d7..94d221e 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service +++ b/meta-openembedded/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 -- 2.7.4