- Don't use /var/lock/subsys in /etc/init.d/ocfs2 (bnc#714644)

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=30

dont-use-var-lock-subsys.patch

@@ -0,0 +1,24 @@
+Index: ocfs2-tools/vendor/common/ocfs2.init
+===================================================================
+--- ocfs2-tools.orig/vendor/common/ocfs2.init
++++ ocfs2-tools/vendor/common/ocfs2.init
+@@ -107,9 +107,6 @@ FUSER=`which fuser`
+ 
+ case "$1" in
+     start|reload)
+-        if [ -d /var/lock/subsys ] ; then
+-            touch /var/lock/subsys/ocfs2
+-        fi
+         if [ -n "`ocfs2fstab`" ] ; then
+             echo -n "Starting Oracle Cluster File System (OCFS2) "
+             mount -at ocfs2
+@@ -143,9 +140,6 @@ case "$1" in
+             retry=$(($retry - 1))
+             sig=-9
+         done
+-        if [ -z "$remaining" ] && [ -e /var/lock/subsys/ocfs2 ] ; then
+-                rm /var/lock/subsys/ocfs2
+-        fi
+         [ -z "$remaining" ] && success_status
+         ;;
+     restart|force-reload)

ocfs2-tools.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Aug 30 09:38:52 UTC 2011 - tserong@suse.com
+
+- Don't use /var/lock/subsys in /etc/init.d/ocfs2 (bnc#714644)
+
 -------------------------------------------------------------------
 Mon Aug 29 05:16:05 UTC 2011 - tserong@suse.com
 

ocfs2-tools.spec

@@ -22,7 +22,7 @@ Name:           ocfs2-tools
 BuildRequires:  e2fsprogs-devel glib2-devel libcorosync-devel libdlm-devel libopenais-devel libpacemaker-devel libxml2-devel libxslt-devel python-devel python-gtk-devel readline-devel update-desktop-files
 Summary:        Oracle Cluster File System 2 Core Tools
 Version:        1.8.0
-Release:        1
+Release:        2
 License:        GPLv2+
 Group:          System/Filesystems
 Source:         ocfs2-tools.tar.bz2
@@ -38,6 +38,7 @@ Patch107:       reflink-no-syscall.patch
 Patch201:       bug-543119-o2dlm.patch
 Patch202:       fix-configure-check-libs.patch
 Patch203:       fix-ocfs2_controld-crmcommon-link.patch
+Patch204:       dont-use-var-lock-subsys.patch
 Url:            http://oss.oracle.com/projects/ocfs2-tools/
 Requires:       net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3
 PreReq:         %insserv_prereq %fillup_prereq
@@ -129,6 +130,7 @@ Authors:
 %patch201 -p1
 %patch202 -p1
 %patch203 -p1
+%patch204 -p1
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}