summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-07-25 15:24:21 +0000
committerRoss Burton <ross@openedhand.com>2008-07-25 15:24:21 +0000
commit1befcc03554974428b9c38d5cb37de3973c5eb8b (patch)
tree4dc45c28420b50122813c201a4734117a0bc480a /meta
parenta228c3118f08da905bec62076eddffc081e5e565 (diff)
downloadpoky-1befcc03554974428b9c38d5cb37de3973c5eb8b.tar.gz
xserver-nodm-init: rdepend on dbus-wait and wait for the desktop signal before continuing boot
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4961 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-nodm-init.bb3
-rwxr-xr-xmeta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm3
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb b/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb
index 1275e98a74..85d5eb1fb6 100644
--- a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb
+++ b/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4PRIORITY = "optional" 4PRIORITY = "optional"
5PR = "r14" 5PR = "r15"
6RDEPENDS = "dbus-wait"
6 7
7SRC_URI = "file://xserver-nodm" 8SRC_URI = "file://xserver-nodm"
8S = ${WORKDIR} 9S = ${WORKDIR}
diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
index ce1f53ffa7..43f7f233a6 100755
--- a/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
+++ b/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
@@ -27,7 +27,8 @@ case "$1" in
27 . /etc/profile 27 . /etc/profile
28 echo "Starting Xserver" 28 echo "Starting Xserver"
29 /etc/X11/Xserver & 29 /etc/X11/Xserver &
30 sleep 20 30 # Wait for the desktop to say its finished loading
31 dbus-wait org.matchbox_project.desktop Loaded
31 ;; 32 ;;
32 33
33 stop) 34 stop)