From bca27d911179f05a84a7f666570d32df84a3a9ad Mon Sep 17 00:00:00 2001
From: Chris Lalancette <clalance@fedoraproject.org>
Date: Mar 28 2008 18:45:49 +0000
Subject: Fix another bug in the fs handling, where the <source> tags when doing

dumpxml didn't match up with what was used to define the pool to begin with.

---

diff --git a/libvirt-source-dir-fix.patch b/libvirt-source-dir-fix.patch
new file mode 100644
index 0000000..db02625
--- /dev/null
+++ b/libvirt-source-dir-fix.patch
@@ -0,0 +1,17 @@
+Index: src/storage_conf.c
+===================================================================
+RCS file: /data/cvs/libvirt/src/storage_conf.c,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- a/src/storage_conf.c	27 Feb 2008 10:37:19 -0000	1.3
++++ b/src/storage_conf.c	28 Mar 2008 17:56:44 -0000	1.4
+@@ -479,7 +479,7 @@
+     }
+     if ((options->flags & VIR_STORAGE_BACKEND_POOL_SOURCE_DIR) &&
+         def->source.dir &&
+-        virBufferVSprintf(buf,"    <directory path='%s'/>\n", def->source.dir) < 0)
++        virBufferVSprintf(buf,"    <dir path='%s'/>\n", def->source.dir) < 0)
+         goto no_memory;
+     if ((options->flags & VIR_STORAGE_BACKEND_POOL_SOURCE_ADAPTER) &&
+         def->source.adapter &&
diff --git a/libvirt.spec b/libvirt.spec
index 86f8127..ca349ef 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -21,7 +21,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.4.1
-Release: 5%{?dist}%{?extra_release}
+Release: 6%{?dist}%{?extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -33,6 +33,7 @@ Patch4: %{name}-%{version}-xen-boot-device.patch
 Patch5: %{name}-%{version}-tap-ifname.patch
 Patch6: libvirt-storage-api-iscsi-sendtarget.patch 
 Patch7: libvirt-iscsi-sysfs4.patch 
+Patch8: libvirt-source-dir-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
@@ -152,6 +153,7 @@ of recent versions of Linux (and other OSes).
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 # Xen is available only on i386 x86_64 ia64
@@ -295,6 +297,10 @@ fi
 %doc docs/examples/python
 
 %changelog
+* Fri Mar 28 2008 Chris Lalancette <clalance@redhat.com> - 0.4.1-6.fc9
+- When dumping XML for a storage pool, make the <source> directory tag
+  match the <dir> tag used for specifying the pool in the first place
+
 * Thu Mar 27 2008 Chris Lalancette <clalance@redhat.com> - 0.4.1-5.fc9
 - Do iscsiadm sendtarget before trying to do login
 - Do sysfs scanning for iSCSI LUNs instead of trying to parse them from