Attached are

three patches to fix a problem with Xend starting consoled.  consoled 
depends on xenstored to be running and xenstored is started on demand in 
Xend.  The patches change xenstored to manage its own pidfile, and have 
xend start actually start up xenstored.

1 files changed, 15 insertions, 0 deletions

diff --git a/tools/xenstore/utils.c b/tools/xenstore/utils.c
index 0b1ac8aedd..cc5e0bc5f2 100644
--- a/tools/xenstore/utils.c
+++ b/tools/xenstore/utils.c
@@ -84,6 +84,9 @@ void *malloc_nofail(size_t size)
 void daemonize(void)
 {
 	pid_t pid;
+	int fd;
+	size_t len;
+	char buf[100];
 
 	/* Separate from our parent via fork, so init inherits us. */
 	if ((pid = fork()) < 0)
@@ -101,6 +104,18 @@ void daemonize(void)
 	chdir("/");
 	/* Discard our parent's old-fashioned umask prejudices. */
 	umask(0);
+
+	fd = open("/var/run/xenstored.pid", O_RDWR | O_CREAT);
+	if (fd == -1) {
+		exit(1);
+	}
+
+	if (lockf(fd, F_TLOCK, 0) == -1) {
+		exit(1);
+	}
+
+	len = sprintf(buf, "%d\n", getpid());
+	write(fd, buf, len);
 }