aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriap10@tetris.cl.cam.ac.uk <iap10@tetris.cl.cam.ac.uk>2005-03-10 15:06:51 +0000
committeriap10@tetris.cl.cam.ac.uk <iap10@tetris.cl.cam.ac.uk>2005-03-10 15:06:51 +0000
commit96839bbe7ea767a81431f1d1e27ba2989601d90f (patch)
tree859851802f016b6bbbfff8e8a57190f89cd02114
parent6c23763e5e9561ec315bb7de1a4426f9abd05291 (diff)
parent59f0cea86aa42e59cef1a61af9006677f7bcf954 (diff)
downloadxen-96839bbe7ea767a81431f1d1e27ba2989601d90f.tar.gz
xen-96839bbe7ea767a81431f1d1e27ba2989601d90f.tar.bz2
xen-96839bbe7ea767a81431f1d1e27ba2989601d90f.zip
bitkeeper revision 1.1159.258.38 (4230628bX3yukmWYtNDh925BckMoHQ)
Merge ssh://xenbk@gandalf.hpl.hp.com//var/bk/xen-2.0-testing.bk into tetris.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
-rw-r--r--tools/python/xen/xend/server/SrvDaemon.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/python/xen/xend/server/SrvDaemon.py b/tools/python/xen/xend/server/SrvDaemon.py
index d54dec26bb..05eb1ed016 100644
--- a/tools/python/xen/xend/server/SrvDaemon.py
+++ b/tools/python/xen/xend/server/SrvDaemon.py
@@ -15,6 +15,7 @@ import pwd
import re
import StringIO
import traceback
+import time
from twisted.internet import pollreactor
pollreactor.install()
@@ -516,8 +517,8 @@ class Daemon:
self.install_child_reaper()
if self.fork_pid(XEND_PID_FILE):
- #Parent
- pass
+ #Parent. Sleep to give child time to start.
+ time.sleep(1)
else:
# Child
self.tracing(trace)