From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 15 Dec 2011 05:54:00 +0000 (+0100)
Subject: fix schema to allow toplevel pvevm resource
X-Git-Url: https://git.proxmox.com/?p=redhat-cluster-pve.git;a=commitdiff_plain;h=1d7dd7dc4ea19984c85f55c78bb840c1245680c1;hp=b8ee068247ef39bc1974e6dafdbde51aae36ce6d

fix schema to allow toplevel pvevm resource
---

diff --git a/Makefile b/Makefile
index 60b2343..f42eb19 100644
--- 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 28de20b..99a00e3 100644
--- 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
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 44295ff..1b3a2e5 100644
--- 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