[Debian-ha-commits] [fence-agents] 01/01: fence_scsi: Fix /sbin/vgs path.

[myon at debian.org]

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

myon pushed a commit to branch master
in repository fence-agents.

commit 9ab4e69bd30381b31ae33854d94da0677fbb8438
Author: Christoph Berg <christoph.berg at credativ.de>
Date:   Thu Sep 24 13:54:54 2015 +0200

    fence_scsi: Fix /sbin/vgs path.
---
 debian/changelog        |  6 ++++++
 debian/patches/series   |  1 +
 debian/patches/vgs-path | 11 +++++++++++
 debian/rules            |  6 +++++-
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 96221e1..966d481 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fence-agents (4.0.21-2) unstable; urgency=medium
+
+  * fence_scsi: Fix /sbin/vgs path.
+
+ -- Christoph Berg <christoph.berg at credativ.de>  Thu, 24 Sep 2015 13:43:17 +0200
+
 fence-agents (4.0.21-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/patches/series b/debian/patches/series
index cfc3eb4..5c5d21d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 reproducible
+vgs-path
diff --git a/debian/patches/vgs-path b/debian/patches/vgs-path
new file mode 100644
index 0000000..947f378
--- /dev/null
+++ b/debian/patches/vgs-path
@@ -0,0 +1,11 @@
+--- a/tests/data/metadata/fence_scsi.xml
++++ b/tests/data/metadata/fence_scsi.xml
+@@ -101,7 +101,7 @@ The fence_scsi agent works by having eac
+ 	</parameter>
+ 	<parameter name="vgs_path" unique="0" required="0">
+ 		<getopt mixed="--vgs-path=[path]" />
+-		<content type="string" default="/usr/sbin/vgs"  />
++		<content type="string" default="/sbin/vgs"  />
+ 		<shortdesc lang="en">Path to vgs binary</shortdesc>
+ 	</parameter>
+ </parameters>
diff --git a/debian/rules b/debian/rules
index 7e4dda7..5e87b71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,11 @@ override_dh_autoreconf:
 override_dh_auto_configure:
 	#[ -f configure ] || sh autogen.sh # Use this when tarball is fixed
 	if [ -e configure -a ! -x configure ]; then chmod u+x configure; fi
-	./configure --bindir=/usr/bin --sbindir=/usr/sbin --libexecdir=/usr/lib/fence-agents
+	./configure \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib/fence-agents \
+		VGS_PATH=/sbin/vgs
 
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp

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