rpms/xen/devel xen-xenstore-cli.patch,1.1,1.2 xen.spec,1.208,1.209

[Daniel P. Berrange (berrange)]

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4522

Modified Files:
	xen-xenstore-cli.patch xen.spec 
Log Message:
Fixed xenstore-ls command socket usage

xen-xenstore-cli.patch:

Index: xen-xenstore-cli.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-xenstore-cli.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-xenstore-cli.patch	1 Feb 2008 23:30:45 -0000	1.1
+++ xen-xenstore-cli.patch	6 Feb 2008 18:23:16 -0000	1.2
@@ -1,7 +1,7 @@
-diff -r c6776b6da8ee tools/xenstore/xenstore_client.c
---- a/tools/xenstore/xenstore_client.c	Wed Nov 14 23:35:43 2007 +0000
-+++ b/tools/xenstore/xenstore_client.c	Fri Feb 01 22:17:48 2008 +0100
-@@ -350,7 +350,9 @@ main(int argc, char **argv)
+diff -rup xen-3.2.0.orig/tools/xenstore/xenstore_client.c xen-3.2.0.new/tools/xenstore/xenstore_client.c
+--- xen-3.2.0.orig/tools/xenstore/xenstore_client.c	2008-02-06 13:18:04.000000000 -0500
++++ xen-3.2.0.new/tools/xenstore/xenstore_client.c	2008-02-06 13:17:43.000000000 -0500
+@@ -357,7 +357,9 @@ main(int argc, char **argv)
  
      xsh = socket ? xs_daemon_open() : xs_domain_open();
      if (xsh == NULL)
@@ -12,3 +12,17 @@
  
    again:
      if (transaction) {
+diff -rup xen-3.2.0.orig/tools/xenstore/xsls.c xen-3.2.0.new/tools/xenstore/xsls.c
+--- xen-3.2.0.orig/tools/xenstore/xsls.c	2008-01-16 13:34:59.000000000 -0500
++++ xen-3.2.0.new/tools/xenstore/xsls.c	2008-02-06 13:19:09.000000000 -0500
+@@ -163,7 +163,9 @@ int main(int argc, char *argv[])
+ 
+     xsh = socket ? xs_daemon_open() : xs_domain_open();
+     if (xsh == NULL)
+-        err(1, socket ? "xs_daemon_open" : "xs_domain_open");
++       xsh = socket ? xs_domain_open() : xs_daemon_open();
++    if (xsh == NULL)
++       err(1, "xs_*_open");
+ 
+     print_dir(xsh, (argc - optind) == 1 ? argv[optind] : "/", 0, show_perm);
+ 


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- xen.spec	3 Feb 2008 18:19:57 -0000	1.208
+++ xen.spec	6 Feb 2008 18:23:16 -0000	1.209
@@ -2,7 +2,7 @@
 
 # Always set these 3 tags
 %define base_version 3.2.0
-%define base_release 5
+%define base_release 6
 
 # Hypervisor ABI
 %define hv_abi  3.2
@@ -448,6 +448,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Feb  6 2008 Daniel P. Berrange <berrange at redhat.com> - 3.2.0-6.fc9
+- Fixed xenstore-ls to automatically use xenstored socket as needed
+
 * Sun Feb  3 2008 Daniel P. Berrange <berrange at redhat.com> - 3.2.0-5.fc9
 - Fix timer mode parameter handling for HVM
 - Temporarily disable all Latex docs due to texlive problems (rhbz #431327)