diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-30 22:23:38 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-31 19:30:29 +0100 |
| commit | 0471b17b061e57231387ef90c95fc0c34fc0e66b (patch) | |
| tree | 5b72abb14ee0dac7e49d1919cfebab9238fffb07 | |
| parent | 02aceca132f9e259cdc5283c4bfe84e6a55df54d (diff) | |
| download | openembedded-core-0471b17b061e57231387ef90c95fc0c34fc0e66b.tar.gz openembedded-core-0471b17b061e57231387ef90c95fc0c34fc0e66b.tar.bz2 openembedded-core-0471b17b061e57231387ef90c95fc0c34fc0e66b.zip | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/x11-common/xserver-nodm-init.bb | 4 | ||||
| -rwxr-xr-x | meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb index d48f700f2d..ea4222df77 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb @@ -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 \ diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm index 3b71983c0a..858af0b67e 100755 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm @@ -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) |