diff options
| author | Christoph Egger <Christoph.Egger@amd.com> | 2011-01-26 16:11:41 +0000 |
|---|---|---|
| committer | Christoph Egger <Christoph.Egger@amd.com> | 2011-01-26 16:11:41 +0000 |
| commit | e948bb957130471f5725dce424a6daa288a10e73 (patch) | |
| tree | f8048caa8d8312e2df76fb4813147e20d36b16b0 | |
| parent | 7e65d6104a0f93ca56c357c75a81763626e8dc83 (diff) | |
| download | xen-e948bb957130471f5725dce424a6daa288a10e73.tar.gz xen-e948bb957130471f5725dce424a6daa288a10e73.tar.bz2 xen-e948bb957130471f5725dce424a6daa288a10e73.zip | |
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@amd.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
| -rw-r--r-- | tools/hotplug/Linux/init.d/xencommons | 2 | ||||
| -rw-r--r-- | tools/libxl/libxl_internal.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/hotplug/Linux/init.d/xencommons b/tools/hotplug/Linux/init.d/xencommons index 9d3ea3fb29..26ab303279 100644 --- a/tools/hotplug/Linux/init.d/xencommons +++ b/tools/hotplug/Linux/init.d/xencommons @@ -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 --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index ab879d02b1..d58b4832bb 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -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 |