# HG changeset patch
# User Dan Smith <danms(a)us.ibm.com>
# Date 1211900260 25200
# Node ID 27e8f7a666411251f721bfac9030a00f391c8855
# Parent f00dd77c664c258551c5f884a0bee5d842241e4e
Add a default pool configuration file to be installed when libvirt version
is older than 0.4.0
Signed-off-by: Dan Smith <danms(a)us.ibm.com>
diff -r f00dd77c664c -r 27e8f7a66641 Makefile.am
--- a/Makefile.am Tue May 20 11:24:39 2008 -0400
+++ b/Makefile.am Tue May 27 07:57:40 2008 -0700
@@ -101,7 +101,8 @@
EXTRA_DIST = schema $(pkgdata_DATA) $(pkgdata_SCRIPTS) \
libvirt-cim.spec.in libvirt-cim.spec \
doc/CodingStyle doc/SubmittingPatches \
- .changeset .revision
+ .changeset .revision \
+ examples/diskpool.conf
preinstall:
sh -x base_schema/install_base_schema.sh `pwd`/base_schema
@@ -111,6 +112,7 @@
postinstall:
sh provider-register.sh -v -t @CIMSERVER@ -n @CIM_VIRT_NS@ -r $(REGS) -m $(MOFS)
sh provider-register.sh -v -t @CIMSERVER@ -n root/interop -r $(INTEROP_REGS) -m
$(INTEROP_MOFS)
+ virsh -v | grep -q '^0.3' && cp examples/diskpool.conf
$(DISK_POOL_CONFIG) || true
preuninstall:
sh provider-register.sh -v -d -t @CIMSERVER@ -n @CIM_VIRT_NS@ -r $(REGS) -m $(MOFS)
diff -r f00dd77c664c -r 27e8f7a66641 acinclude.m4
--- a/acinclude.m4 Tue May 20 11:24:39 2008 -0400
+++ b/acinclude.m4 Tue May 27 07:57:40 2008 -0700
@@ -312,6 +312,8 @@
AC_DEFUN([DEFINE_DISK_CONFIG],
[
AC_DEFINE_UNQUOTED([DISK_POOL_CONFIG], "$1", [Disk pool config filepath.])
+ DISK_POOL_CONFIG=$1
+ AC_SUBST(DISK_POOL_CONFIG)
]
)
diff -r f00dd77c664c -r 27e8f7a66641 examples/diskpool.conf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/diskpool.conf Tue May 27 07:57:40 2008 -0700
@@ -0,0 +1,1 @@
+Default /