Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package ocfs2-tools It fixes a sysfs filename mismatch between the ocfs2-tools and the ocfs2 kernel module as reported in #858623. The patch added in this release has been accepted upstream and makes ocfs2-tools userspace compatible with the stretch kernel. diff -Nru ocfs2-tools-1.8.4/debian/changelog ocfs2-tools-1.8.4/debian/changelog --- ocfs2-tools-1.8.4/debian/changelog 2016-10-21 18:39:01.000000000 +0200 +++ ocfs2-tools-1.8.4/debian/changelog 2017-03-27 11:13:06.000000000 +0200 @@ -1,3 +1,9 @@ +ocfs2-tools (1.8.4-4) unstable; urgency=medium + + * Add fix for sysfs filename (Closes: #858623) + + -- Valentin Vidic <valentin.vi...@carnet.hr> Mon, 27 Mar 2017 11:13:06 +0200 + ocfs2-tools (1.8.4-3) unstable; urgency=medium * Fix debugfs segfault (Closes: #715810) diff -Nru ocfs2-tools-1.8.4/debian/patches/dead_threshold.patch ocfs2-tools-1.8.4/debian/patches/dead_threshold.patch --- ocfs2-tools-1.8.4/debian/patches/dead_threshold.patch 1970-01-01 01:00:00.000000000 +0100 +++ ocfs2-tools-1.8.4/debian/patches/dead_threshold.patch 2017-03-27 11:03:50.000000000 +0200 @@ -0,0 +1,39 @@ +Description: Update sysfs filename for heartbeat dead threshold +Author: Michal Svamberg <svamb...@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.vi...@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 -Nru ocfs2-tools-1.8.4/debian/patches/series ocfs2-tools-1.8.4/debian/patches/series --- ocfs2-tools-1.8.4/debian/patches/series 2016-10-21 18:39:01.000000000 +0200 +++ ocfs2-tools-1.8.4/debian/patches/series 2017-03-24 20:32:52.000000000 +0100 @@ -5,3 +5,4 @@ o2cb-ctl-virtio.patch debugfs-segfault.patch mkfs-segfault.patch +dead_threshold.patch unblock ocfs2-tools/1.8.4-4 -- System Information: Debian Release: 9.0 APT prefers unstable APT policy: (500, 'unstable') Architecture: amd64 (x86_64) Kernel: Linux 4.9.0-2-amd64 (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Init: systemd (via /run/systemd/system)
