xserver-nodm: Disable dbus-wait as it causes users too much confusion

In the event the xserver fails to start the dbus-wait has to time out and
this causes many users a lot of confusion. If we wish to reinstate this,
we need to find a safer mechanism to do it where X failing to start cancels
the timeout (sends a dbus event at that point?) The comments are left in the
file as an example in case some user does wish to enable is.

(From OE-Core rev: 0471b17b061e57231387ef90c95fc0c34fc0e66b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2011-08-30 22:23:38 +01:00
parent a8d5225c3c
commit 8294f427d0
2 changed files with 4 additions and 3 deletions

View File

@@ -2,8 +2,8 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SECTION = "x11"
PR = "r25"
RDEPENDS_${PN} = "dbus-wait sudo"
PR = "r26"
RDEPENDS_${PN} = "sudo"
SRC_URI = "file://xserver-nodm \
file://Xusername \

View File

@@ -38,7 +38,8 @@ case "$1" in
# Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211]
su -l -c '/etc/X11/Xserver&' $username
# Wait for the desktop to say its finished loading
dbus-wait org.matchbox_project.desktop Loaded
# before loading the rest of the system
# dbus-wait org.matchbox_project.desktop Loaded
;;
stop)