Hello community, here is the log from the commit of package ocfs2-tools for openSUSE:Factory checked in at Thu Sep 1 15:47:09 CEST 2011.
-------- --- ocfs2-tools/ocfs2-tools.changes 2011-04-15 15:26:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/ocfs2-tools/ocfs2-tools.changes 2011-08-31 10:51:32.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Aug 30 09:38:52 UTC 2011 - [email protected] + +- Don't use /var/lock/subsys in /etc/init.d/ocfs2 (bnc#714644) + +------------------------------------------------------------------- +Mon Aug 29 05:16:05 UTC 2011 - [email protected] + +- Add -lcrmcommon to fix ocfs2_controld build. + +------------------------------------------------------------------- @@ -4,0 +15,27 @@ + - 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 calling whatdependson for head-i586 New: ---- dont-use-var-lock-subsys.patch fix-ocfs2_controld-crmcommon-link.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocfs2-tools.spec ++++++ --- /var/tmp/diff_new_pack.mRKfHl/_old 2011-09-01 15:35:20.000000000 +0200 +++ /var/tmp/diff_new_pack.mRKfHl/_new 2011-09-01 15:35:20.000000000 +0200 @@ -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: 1 License: GPLv2+ Group: System/Filesystems Source: ocfs2-tools.tar.bz2 @@ -37,6 +37,8 @@ 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 @@ %patch107 -p0 %patch201 -p1 %patch202 -p1 +%patch203 -p1 +%patch204 -p1 %build %{?suse_update_config:%{suse_update_config -f}} ++++++ dont-use-var-lock-subsys.patch ++++++ 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) ++++++ fix-ocfs2_controld-crmcommon-link.patch ++++++ 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) \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
