summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-01-30 16:18:13 +0000
committerRichard Purdie <richard@openedhand.com>2008-01-30 16:18:13 +0000
commit8656619817b8f0b2076e0464e23a642bb84afb87 (patch)
tree14673d723d46dc0731914490e580ea93b109f717 /meta
parent17c753a9247ce9cf4d91f83c0eb5a10905f0a7f4 (diff)
downloadpoky-8656619817b8f0b2076e0464e23a642bb84afb87.tar.gz
qemu-config: Fix poky-chroot-launch to stop dbus system bus correctly
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3629 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/oh/qemu-config.bb2
-rwxr-xr-xmeta/packages/oh/qemu-config/poky-chroot-launch6
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/packages/oh/qemu-config.bb b/meta/packages/oh/qemu-config.bb
index 3eccab99e1..6aed63b338 100644
--- a/meta/packages/oh/qemu-config.bb
+++ b/meta/packages/oh/qemu-config.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "Adds scripts to use distcc on the host system under qemu" 1DESCRIPTION = "Adds scripts to use distcc on the host system under qemu"
2LICENSE = "GPL" 2LICENSE = "GPL"
3RDEPENDS = "distcc task-poky-nfs-server fakeroot oprofileui-server rsync bash" 3RDEPENDS = "distcc task-poky-nfs-server fakeroot oprofileui-server rsync bash"
4PR = "r11" 4PR = "r12"
5 5
6SRC_URI = "file://distcc.sh \ 6SRC_URI = "file://distcc.sh \
7 file://anjuta-remote-run \ 7 file://anjuta-remote-run \
diff --git a/meta/packages/oh/qemu-config/poky-chroot-launch b/meta/packages/oh/qemu-config/poky-chroot-launch
index 63d98d9361..dbc432b66c 100755
--- a/meta/packages/oh/qemu-config/poky-chroot-launch
+++ b/meta/packages/oh/qemu-config/poky-chroot-launch
@@ -18,9 +18,9 @@ done
18 18
19bash -l 19bash -l
20 20
21# The --user option in the dbus stop script breaks under chroot
22/sbin/start-stop-daemon --stop --pidfile /var/run/dbus/pid
23
21for S in $SERVICES; do 24for S in $SERVICES; do
22 fakeroot /etc/init.d/$S stop 25 fakeroot /etc/init.d/$S stop
23done 26done
24
25# The --user option in the dbus stop script breaks under chroot
26/sbin/start-stop-daemon --stop --pidfile /var/run/dbus/pid