[Debian-ha-commits] [ocfs2-tools] 01/02: Add fix for sysfs filename (Closes: #858623)

[Valentin Vidic]

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

vvidic-guest pushed a commit to branch master
in repository ocfs2-tools.

commit f591fd8243909baec1d6a9422e89e525dceb06ca
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Mon Mar 27 11:10:52 2017 +0200

    Add fix for sysfs filename (Closes: #858623)
---
 debian/patches/dead_threshold.patch | 39 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 40 insertions(+)

diff --git a/debian/patches/dead_threshold.patch b/debian/patches/dead_threshold.patch
new file mode 100644
index 0000000..f502403
--- /dev/null
+++ b/debian/patches/dead_threshold.patch
@@ -0,0 +1,39 @@
+Description: Update sysfs filename for heartbeat dead threshold
+Author: Michal Svamberg <svamberg at civ.zcu.cz>
+Bug: https://github.com/markfasheh/ocfs2-tools/pull/9
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858623
+Reviewed-by: Valentin Vidic <Valentin.Vidic at CARNet.hr>
+Last-Update: 2017-03-27
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/o2monitor/o2hbmonitor.c
++++ b/o2monitor/o2hbmonitor.c
+@@ -49,7 +49,7 @@
+ #define SYS_CONFIG_DIR			"/sys/kernel/config"
+ #define O2HB_CLUSTER_DIR		SYS_CONFIG_DIR"/cluster"
+ #define O2HB_HEARTBEAT_DIR		O2HB_CLUSTER_DIR"/%s/heartbeat"
+-#define O2HB_DEAD_THRESHOLD		O2HB_HEARTBEAT_DIR"/dead_threshold"
++#define O2HB_DEAD_THRESHOLD		O2HB_HEARTBEAT_DIR"/threshold"
+ #define O2HB_DEVICE			O2HB_HEARTBEAT_DIR"/%s/dev"
+ 
+ #define SYS_DEBUG_DIR			"/sys/kernel/debug"
+--- a/vendor/common/o2cb.init.sh
++++ b/vendor/common/o2cb.init.sh
+@@ -224,7 +224,7 @@
+ set_timeouts_o2cb()
+ {
+     O2CB_HEARTBEAT_THRESHOLD_FILE_OLD=/proc/fs/ocfs2_nodemanager/hb_dead_threshold
+-    O2CB_HEARTBEAT_THRESHOLD_FILE=$(configfs_path)/cluster/${CLUSTER}/heartbeat/dead_threshold
++    O2CB_HEARTBEAT_THRESHOLD_FILE=$(configfs_path)/cluster/${CLUSTER}/heartbeat/threshold
+     if [ -n "$O2CB_HEARTBEAT_THRESHOLD" ]; then
+         if [ -f "$O2CB_HEARTBEAT_THRESHOLD_FILE" ]; then
+             echo "$O2CB_HEARTBEAT_THRESHOLD" > "$O2CB_HEARTBEAT_THRESHOLD_FILE"
+@@ -259,7 +259,7 @@
+ {
+ 
+     O2CB_HEARTBEAT_THRESHOLD_FILE_OLD=/proc/fs/ocfs2_nodemanager/hb_dead_threshold
+-    O2CB_HEARTBEAT_THRESHOLD_FILE=$(configfs_path)/cluster/${CLUSTER}/heartbeat/dead_threshold
++    O2CB_HEARTBEAT_THRESHOLD_FILE=$(configfs_path)/cluster/${CLUSTER}/heartbeat/threshold
+     if [ -f "$O2CB_HEARTBEAT_THRESHOLD_FILE" ]; then
+         VAL=`cat "$O2CB_HEARTBEAT_THRESHOLD_FILE"`
+         echo "  Heartbeat dead threshold: ${VAL}"
diff --git a/debian/patches/series b/debian/patches/series
index d3d092e..b3dead9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ ocfs2-udev-rule.patch
 o2cb-ctl-virtio.patch
 debugfs-segfault.patch
 mkfs-segfault.patch
+dead_threshold.patch

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