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:38:31 +0100 |
commit | 8294f427d00efb074c3746534a9b1e325bfb00b4 (patch) | |
tree | 5cf1a34ae8c7b6f01ecadcf6bd56cf6f07bde5ca /meta/recipes-graphics/x11-common/xserver-nodm-init | |
parent | a8d5225c3c05b6f6c48e7db5cfb81786ae52b89b (diff) | |
download | poky-8294f427d00efb074c3746534a9b1e325bfb00b4.tar.gz |
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>
Diffstat (limited to 'meta/recipes-graphics/x11-common/xserver-nodm-init')
-rwxr-xr-x | meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm | 3 |
1 files changed, 2 insertions, 1 deletions
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 | |||
38 | # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211] | 38 | # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211] |
39 | su -l -c '/etc/X11/Xserver&' $username | 39 | su -l -c '/etc/X11/Xserver&' $username |
40 | # Wait for the desktop to say its finished loading | 40 | # Wait for the desktop to say its finished loading |
41 | dbus-wait org.matchbox_project.desktop Loaded | 41 | # before loading the rest of the system |
42 | # dbus-wait org.matchbox_project.desktop Loaded | ||
42 | ;; | 43 | ;; |
43 | 44 | ||
44 | stop) | 45 | stop) |