[Debian-ha-commits] [resource-agents] 02/06: Xen: use the toolstack selected in /etc/default/xen (Closes: #854276)

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch master
in repository resource-agents.

commit 1c5b024796d344ff6dae62b87efb8678902ac623
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Thu Aug 3 13:20:50 2017 +0200

    Xen: use the toolstack selected in /etc/default/xen (Closes: #854276)
---
 debian/patches/series              |  1 +
 debian/patches/xen-toolstack.patch | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 51cf8e5..c813ee8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ no-dirty-version
 ipv6-linux-only
 ocft-configs.patch
 pgsql-9.6
+xen-toolstack.patch
diff --git a/debian/patches/xen-toolstack.patch b/debian/patches/xen-toolstack.patch
new file mode 100644
index 0000000..16c6347
--- /dev/null
+++ b/debian/patches/xen-toolstack.patch
@@ -0,0 +1,22 @@
+Description: Use the toolstack selected in /etc/default/xen
+ Xen agent should use the configured toolstack and not prefer xl.
+ This patch can be dropped once there is only one supported toolstack.
+Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
+Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854276
+Forwarded: not-needed
+Last-Update: 2017-08-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/heartbeat/Xen
++++ b/heartbeat/Xen
+@@ -44,8 +44,8 @@
+ : ${OCF_RESKEY_allow_mem_management=0}
+ : ${OCF_RESKEY_reserved_Dom0_memory=512}
+ 
+-# prefer xl
+-xentool=$(which xl 2> /dev/null || which xm)
++# use /etc/default/xen
++xentool=$(/usr/lib/xen-common/bin/xen-toolstack)
+ 
+ meta_data() {
+ 	cat <<END

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/resource-agents.git