xend does not run for me with the latest nightly snapshot because xcs
won''t start. xcs won''t start because it''s using
/var/xen, while it
should be using /var/lib/xen. This patch changes xcs and xend to use
/var/lib/xen/xcs_socket, and make xcs give a better error message when
it cannot bind to its socket.
Signed-off-by: Muli Ben-Yehuda <mulix@mulix.org>
diff -Naurp xen-unstable-src-200503031032/tools/misc/xend vpci/tools/misc/xend
--- xen-unstable-src-200503031032/tools/misc/xend 2005-03-02 23:13:34.000000000
-0500
+++ vpci/tools/misc/xend 2005-03-04 14:59:00.000000000 -0500
@@ -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"
diff -Naurp xen-unstable-src-200503031032/tools/xcs/xcs.c vpci/tools/xcs/xcs.c
--- xen-unstable-src-200503031032/tools/xcs/xcs.c 2005-03-02 23:13:32.000000000
-0500
+++ vpci/tools/xcs/xcs.c 2005-03-04 15:00:52.000000000 -0500
@@ -241,7 +241,7 @@ static int listen_socket (char *listen_p
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;
}
diff -Naurp xen-unstable-src-200503031032/tools/xcs/xcs_proto.h
vpci/tools/xcs/xcs_proto.h
--- xen-unstable-src-200503031032/tools/xcs/xcs_proto.h 2005-03-02
23:13:31.000000000 -0500
+++ vpci/tools/xcs/xcs_proto.h 2005-03-04 14:59:05.000000000 -0500
@@ -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. */
--
Muli Ben-Yehuda
http://www.mulix.org | http://mulix.livejournal.com/