[Xen-changelog] [xen-unstable] libxl: rename xenstored pid file on Linux

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Christoph Egger <Christoph.Egger@xxxxxxx>
# Date 1296058301 0
# Node ID 5ce41defa1fa1fd98dc36bff74a139aea4e620e8
# Parent  310cc33bfc810824c9f818ca7f320e6e88f26705
libxl: rename xenstored pid file on Linux

Changset 22806:eefb8e971be5 broke 'xl'.

After starting the xenstored, xenconsoled, xenbackendd and running xl
create I get this:
  libxl: error: libxl.c:53:libxl_ctx_init Is xenstore daemon running?
  failed to stat /var/run/xenstore.pid: No such file or directory
  cannot init xl context

The reason for the failure is that the NetBSD startup script
creates the file
  /var/run/xenstored.pid
but libxl checks for
  /var/run/xenstore.pid

Attached patch makes this consistent across Linux and NetBSD by
changing the Linux name (to the more-conventional food.pid form).

Signed-off-by: Christoph Egger <Christoph.Egger@xxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/hotplug/Linux/init.d/xencommons |    2 +-
 tools/libxl/libxl_internal.h          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -r 310cc33bfc81 -r 5ce41defa1fa tools/hotplug/Linux/init.d/xencommons
--- a/tools/hotplug/Linux/init.d/xencommons     Wed Jan 26 16:05:09 2011 +0000
+++ b/tools/hotplug/Linux/init.d/xencommons     Wed Jan 26 16:11:41 2011 +0000
@@ -52,7 +52,7 @@ do_start () {
                test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T 
/var/log/xen/xenstored-trace.log"
 
                echo -n Starting xenstored...
-               xenstored --pid-file=/var/run/xenstore.pid $XENSTORED_ARGS
+               xenstored --pid-file=/var/run/xenstored.pid $XENSTORED_ARGS
 
                # Wait for xenstored to actually come up, timing out after 30 
seconds
                 while [ $time -lt $timeout ] && ! `xenstore-read -s / 
>/dev/null 2>&1` ; do
diff -r 310cc33bfc81 -r 5ce41defa1fa tools/libxl/libxl_internal.h
--- a/tools/libxl/libxl_internal.h      Wed Jan 26 16:05:09 2011 +0000
+++ b/tools/libxl/libxl_internal.h      Wed Jan 26 16:11:41 2011 +0000
@@ -110,7 +110,7 @@ typedef struct {
 #define AUTO_PHP_SLOT          0x100
 #define SYSFS_PCI_DEV          "/sys/bus/pci/devices"
 #define SYSFS_PCIBACK_DRIVER   "/sys/bus/pci/drivers/pciback"
-#define XENSTORE_PID_FILE      "/var/run/xenstore.pid"
+#define XENSTORE_PID_FILE      "/var/run/xenstored.pid"
 
 #define PROC_PCI_NUM_RESOURCES 7
 #define PCI_BAR_IO             0x01

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog