Accepting request 80342 from network:ha-clustering:Factory
- Don't use /var/lock/subsys in /etc/init.d/ocfs2 (bnc#714644) - Add -lcrmcommon to fix ocfs2_controld build. - Improve 1.8.0 changelog entry OBS-URL: https://build.opensuse.org/request/show/80342 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocfs2-tools?expand=0&rev=35
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
commit
8d7f25d3b6
24
dont-use-var-lock-subsys.patch
Normal file
24
dont-use-var-lock-subsys.patch
Normal file
@ -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)
|
||||
13
fix-ocfs2_controld-crmcommon-link.patch
Normal file
13
fix-ocfs2_controld-crmcommon-link.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Index: ocfs2-tools/ocfs2_controld/Makefile
|
||||
===================================================================
|
||||
--- ocfs2-tools.orig/ocfs2_controld/Makefile
|
||||
+++ ocfs2-tools/ocfs2_controld/Makefile
|
||||
@@ -67,7 +67,7 @@ DIST_FILES = \
|
||||
ocfs2_controld.pcmk: $(PCMK_DAEMON_OBJS) $(LIBO2CB_DEPS)
|
||||
$(LINK) $(GLIB_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) \
|
||||
$(OPENAIS_LIBS) $(COROSYNC_LIBS) \
|
||||
- $(DLMCONTROL_LIBS) -lcrmcluster -lstonithd
|
||||
+ $(DLMCONTROL_LIBS) -lcrmcluster -lstonithd -lcrmcommon
|
||||
|
||||
ocfs2_controld.cman: $(CMAN_DAEMON_OBJS) $(LIBO2CB_DEPS)
|
||||
$(LINK) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(OPENAIS_LIBS) \
|
||||
@ -1,7 +1,44 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- Add -lcrmcommon to fix ocfs2_controld build.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 15 12:46:03 UTC 2011 - i@coly.li
|
||||
|
||||
- update ocfs2-tools to 1.8.0
|
||||
- mkfs.ocfs2 enables file system features indexed-dirs, discontig-bg,
|
||||
refcount & extended-slotmap by default.
|
||||
- ocfs2console is no longer built by default.
|
||||
- ocfs2-tools: fsck.ocfs2 and *ctl built dynamically by default
|
||||
- debugfs: Add -T to logdump
|
||||
- mounted.ocfs2: Show cluster and global heartbeat
|
||||
- mount.ocfs2: Validate mount path before mount
|
||||
- mount.ocfs2: Add support for o2cb global heartbeat
|
||||
- tools: Detect differing cluster name and heartbeat modes
|
||||
- mkfs.ocfs2: Add -U option to allow custom UUIDs
|
||||
- mkfs.ocfs2: Add --global-heartbeat option
|
||||
- libo2cb: Validate cluster name and cluster flags in classic_begin_group_join()
|
||||
- o2cb: Add man page
|
||||
- o2cb: Add ops start-heartbeat and stop-heartbeat
|
||||
- o2cb: Add ops register-cluster and unregister-cluster
|
||||
- o2cb: Add ops list-clusters, list-cluster, list-nodes and list-heartbeats
|
||||
- o2cb: Add ops add-heartbeat, remove-heartbeat and heartbeat-mode
|
||||
- o2cb: Add ops add-node and remove-node
|
||||
- o2cb: Add ops add-cluster and remove-cluster
|
||||
- o2cb: Add a new cluster configuration tool
|
||||
- libo2cb: Adds support for global heartbeat
|
||||
- libo2cb: Extend libo2cb api to learn ip address/port/local of a registered node
|
||||
- o2cb_scandisk: Scan heartbeat devices
|
||||
- debugfs.ocfs2: Journal logdump prints full inode and extent blocks
|
||||
- debugfs.ocfs2: Improve block detection
|
||||
- ocfs2-tools: Set hash seed when convert ocfs2 to support indexed-dirs
|
||||
- ocfs2-tools: o2hbmonitor moved to /usr/sbin
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 2 08:09:49 UTC 2010 - i@coly.li
|
||||
|
||||
@ -21,8 +21,8 @@
|
||||
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.6.3
|
||||
Release: 8
|
||||
Version: 1.8.0
|
||||
Release: 2
|
||||
License: GPLv2+
|
||||
Group: System/Filesystems
|
||||
Source: ocfs2-tools.tar.bz2
|
||||
@ -37,6 +37,8 @@ Patch106: ocfs2-devel.diff
|
||||
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
|
||||
@ -127,6 +129,8 @@ Authors:
|
||||
%patch107 -p0
|
||||
%patch201 -p1
|
||||
%patch202 -p1
|
||||
%patch203 -p1
|
||||
%patch204 -p1
|
||||
|
||||
%build
|
||||
%{?suse_update_config:%{suse_update_config -f}}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user