fix schema to allow toplevel pvevm resource

diff --git a/Makefile b/Makefile
index 60b2343e4154e10f9a3e23c24d4e8e66e3aad376..f42eb19f7962dd7f995bf811f2eddf24dbf28151 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ RHCDIR=cluster-${RHCVER}
 RHCSRC=${RHCDIR}.tar.gz
 
 PACKAGE=redhat-cluster-pve
-PKGREL=1
+PKGREL=2
 
 DEBS=                                                                  \
        ${PACKAGE}_${RHCVER}-${PKGREL}_amd64.deb                        \

diff --git a/debian/changelog b/debian/changelog
index 28de20bc3344cb6f03c028d24d7f2557e9a13e21..99a00e395e8827bb74d6f75581f2ed847baed01c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+redhat-cluster-pve (3.1.8-2) unstable; urgency=low
+
+  * fix schema to allow toplevel pvevm resource
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 15 Dec 2011 06:53:49 +0100
+
 redhat-cluster-pve (3.1.8-1) unstable; urgency=low
 
   * update to upstream release 3.1.8

diff --git a/debian/patches/fix-cluster-schema.diff b/debian/patches/fix-cluster-schema.diff
new file mode 100644 (file)
index 0000000..3ade580
--- /dev/null
+++ b/debian/patches/fix-cluster-schema.diff
@@ -0,0 +1,14 @@
+Index: new/config/tools/xml/cluster.rng.in.head
+===================================================================
+--- new.orig/config/tools/xml/cluster.rng.in.head      2011-12-13 12:55:22.000000000 +0100
++++ new/config/tools/xml/cluster.rng.in.head   2011-12-13 12:56:30.000000000 +0100
+@@ -988,6 +988,9 @@
+    <zeroOrMore>
+     <ref name="VM"/>
+    </zeroOrMore>
++   <zeroOrMore>
++    <ref name="PVEVM"/>
++   </zeroOrMore>
+   </interleave>
+   </element>
+  </optional>

diff --git a/debian/patches/series b/debian/patches/series
index 44295ff70b9cb4463c8c07b411e3a1cf1eb047e2..1b3a2e52930a5c82033782fc8114d28ac5efa82f 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ fix-lsb-header.diff
 fix-rgmanager-init.diff
 fix-startup-config-timeout.diff
 #fix-quorum-wait-time.diff
+fix-cluster-schema.diff