fix pathname for ctdb_etcd_lock

Forwarded: not-needed

Specify the actual installation path for this helper script.

This is a quick hack, this issue should be addressed
upstream in a more generic way.

Gbp-Pq: Name ctdb_etcd_lock-path.patch

diff --git a/ctdb/doc/ctdb-etcd.7.xml b/ctdb/doc/ctdb-etcd.7.xml
index af343dbaa57014d2aafea4cbb8b77af07e6c6e80..113593562e5a08dd9c8590781091f7c2ce7c1b08 100644 (file)
--- a/ctdb/doc/ctdb-etcd.7.xml
+++ b/ctdb/doc/ctdb-etcd.7.xml
@@ -68,7 +68,7 @@
       <manvolnum>5</manvolnum></citerefentry>:
     </para>
     <screen format="linespecific">
-cluster lock = !/usr/local/usr/libexec/ctdb/ctdb_etcd_lock
+cluster lock = !/usr/libexec/ctdb/ctdb_etcd_lock
     </screen>
     <para>
       You can also pass "-v", "-vv", or "-vvv" to include verbose output in

diff --git a/ctdb/utils/etcd/ctdb_etcd_lock b/ctdb/utils/etcd/ctdb_etcd_lock
index dac24361e7764deacccceae8fef82855ef0d6c81..e695ac7cab2c4f9770996304fbe828da97e1314b 100755 (executable)
--- a/ctdb/utils/etcd/ctdb_etcd_lock
+++ b/ctdb/utils/etcd/ctdb_etcd_lock
@@ -23,7 +23,7 @@ CTDB's cluster lock. Please see ctdb/doc/cluster_mutex_helper.txt for
 details on what we're SUPPOSED to be doing. :) To use this, include
 the following line in the ctdb.conf:
 
-    cluster lock = !/path/to/script
+    cluster lock = !/usr/libexec/ctdb/ctdb_etcd_lock
 
 You can also pass "-v", "-vv", or "-vvv" to include verbose output in the
 CTDB log. Additional "v"s indicate increases in verbosity.