summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-30 22:23:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-31 19:38:31 +0100
commit8294f427d00efb074c3746534a9b1e325bfb00b4 (patch)
tree5cf1a34ae8c7b6f01ecadcf6bd56cf6f07bde5ca
parenta8d5225c3c05b6f6c48e7db5cfb81786ae52b89b (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-graphics/x11-common/xserver-nodm-init.bb4
-rwxr-xr-xmeta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm3
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)"
2LICENSE = "GPLv2" 2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
4SECTION = "x11" 4SECTION = "x11"
5PR = "r25" 5PR = "r26"
6RDEPENDS_${PN} = "dbus-wait sudo" 6RDEPENDS_${PN} = "sudo"
7 7
8SRC_URI = "file://xserver-nodm \ 8SRC_URI = "file://xserver-nodm \
9 file://Xusername \ 9 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
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)