bitkeeper revision 1.1236.1.60 (42299622PoSV4xT6Ds22AHb8mP24xA)

XCS binds thru /var/lib/xen and gives better error message if this
fails.
Signed-off-by: Muli Ben-Yahuda <mulix@mulix.org>
Signed-off-by: Keir Fraser <keir@xensource.com>

tools/misc/xend

@@ -24,7 +24,7 @@ import sys
 import socket
 import time
 
-XCS_PATH = "/var/xen/xcs_socket"
+XCS_PATH = "/var/lib/xen/xcs_socket"
 XCS_EXEC = "/usr/sbin/xcs"
 XCS_LOGFILE = "/var/log/xcs.log"
 

tools/xcs/xcs.c

@@ -241,7 +241,7 @@ static int listen_socket (char *listen_path)
 
     if (bind(s, (struct sockaddr *) &a, sizeof (a)) < 0) 
     {
-        perror ("bind");
+        fprintf (stderr, "bind('%s'): %s\n", listen_path, strerror(errno));
         close (s);
         return -1;
     }

tools/xcs/xcs_proto.h

@@ -9,7 +9,7 @@
 #ifndef  __XCS_PROTO_H__
 #define  __XCS_PROTO_H__
 
-#define XCS_SUN_PATH     "/var/xen/xcs_socket"
+#define XCS_SUN_PATH     "/var/lib/xen/xcs_socket"
 
 /* xcs message types: */
 #define XCS_CONNECT_CTRL       0 /* This is a control connection.     */