diff options
| author | Ross Burton <ross@openedhand.com> | 2008-07-25 15:24:21 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2008-07-25 15:24:21 +0000 |
| commit | 1befcc03554974428b9c38d5cb37de3973c5eb8b (patch) | |
| tree | 4dc45c28420b50122813c201a4734117a0bc480a | |
| parent | a228c3118f08da905bec62076eddffc081e5e565 (diff) | |
| download | openembedded-core-1befcc03554974428b9c38d5cb37de3973c5eb8b.tar.gz openembedded-core-1befcc03554974428b9c38d5cb37de3973c5eb8b.tar.bz2 openembedded-core-1befcc03554974428b9c38d5cb37de3973c5eb8b.tar.xz openembedded-core-1befcc03554974428b9c38d5cb37de3973c5eb8b.zip | |
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
| -rw-r--r-- | meta/packages/xserver-kdrive-common/xserver-nodm-init.bb | 3 | ||||
| -rwxr-xr-x | meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm | 3 |
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 1275e98a7..85d5eb1fb 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)" LICENSE = "GPL" SECTION = "x11" PRIORITY = "optional" -PR = "r14" +PR = "r15" +RDEPENDS = "dbus-wait" SRC_URI = "file://xserver-nodm" S = ${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 ce1f53ffa..43f7f233a 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 . /etc/profile echo "Starting Xserver" /etc/X11/Xserver & - sleep 20 + # Wait for the desktop to say its finished loading + dbus-wait org.matchbox_project.desktop Loaded ;; stop) |