OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocfs2-tools?expand=0&rev=5

ocfs2-tools-suse.diff

@@ -13,6 +13,74 @@ Index: ocfs2-tools/vendor/common/o2cb.init
  # Required-Stop:
  # Default-Start: 2 3 5
  # Default-Stop:
+@@ -130,6 +130,10 @@ O2CB_BOOTCLUSTER=${O2CB_BOOTCLUSTER}
+ # O2CB_RECONNECT_DELAY_MS: Min time in ms between connection attempts
+ O2CB_RECONNECT_DELAY_MS=${O2CB_RECONNECT_DELAY_MS}
+ 
++# O2CB_HEARTBEAT_MODE: Whether to use the native "kernel" or the "user"
++# driven heartbeat (for example, for integration with heartbeat 2.0.x)
++O2CB_HEARTBEAT_MODE="${O2CB_HEARTBEAT_MODE:-kernel}"
++
+ EOF
+ 
+     if [ $? != 0 ]
+@@ -208,6 +212,34 @@ EOF
+     read_timeout "network reconnect delay in ms" "$O2CB_RECONNECT_DELAY_MS" "$MIN_RECONNECT_DELAY_MS" "$DEF_RECONNECT_DELAY_MS"
+     O2CB_RECONNECT_DELAY_MS="$RET_VAL"
+ 
++    while :
++    do
++        if [ "$O2CB_HEARTBEAT_MODE" = "user" ]
++        then
++            CUR=y
++        else
++            CUR=n
++        fi
++        echo -n "Use user-space driven heartbeat? (y/n) [$CUR]: "
++        read LINE
++        case "$LINE" in
++        "")
++            break
++            ;;
++        y|Y)
++            O2CB_HEARTBEAT_MODE=user
++            break
++            ;;
++        n|N)
++            O2CB_HEARTBEAT_MODE=kernel
++            break
++            ;;
++        *)
++            echo "Invalid answer: $LINE" >&2
++            ;;
++        esac
++    done
++
+     # XXX ask about mount point base
+ }
+ 
+@@ -526,6 +558,21 @@ load()
+         eval ${LOAD_ACTIONS[i]}
+         if_fail "$?"
+     done
++
++    if [ "$O2CB_HEARTBEAT_MODE" = "user" ] ; then
++	echo -n "Switching to user mode heartbeat : "
++	if modprobe ocfs2_user_heartbeat 2>/dev/null ; then
++			if echo user > /sys/o2cb/heartbeat_mode ; then
++				echo "OK"
++			else
++				echo "FAILED"
++			fi
++				
++		else
++			echo "FAILED"
++		fi
++    fi
++	
+ }
+ 
+ load_status()
 Index: ocfs2-tools/debugfs.ocfs2/Makefile
 ===================================================================
 --- ocfs2-tools.orig/debugfs.ocfs2/Makefile

ocfs2-tools.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Feb 22 17:05:56 CET 2008 - jeffm@suse.com
+
+- Re-added init script support for userspace heartbeat.
+
 -------------------------------------------------------------------
 Tue Feb 19 21:14:00 CET 2008 - jeffm@suse.com
 

ocfs2-tools.spec

@@ -15,7 +15,7 @@ Name:           ocfs2-tools
 BuildRequires:  e2fsprogs-devel glib2-devel python-devel python-gtk-devel readline-devel update-desktop-files
 Summary:        Oracle Cluster File System 2 Core Tools
 Version:        1.3.9
-Release:        1
+Release:        4
 License:        GPL v2 or later
 Group:          System/Filesystems
 Source:         ocfs2-tools-%{version}.tar.bz2
@@ -182,6 +182,8 @@ fi
 %{_libdir}/pkgconfig/ocfs2.pc
 
 %changelog
+* Fri Feb 22 2008 jeffm@suse.com
+- Re-added init script support for userspace heartbeat.
 * Tue Feb 19 2008 jeffm@suse.com
 - Statically link glib-2.0 with tunefs and o2cb_ctl.
 * Mon Jan 28 2008 jeffm@suse.com