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

ocfs2-tools.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Feb 27 03:53:53 CET 2009 - coyli@suse.de
+
+- tunefs.ocfs2.8.in_more_options.diff: add manual info for
+  -y, -n and --update-cluster-statck options (bnc#478259) 
+
+-------------------------------------------------------------------
+Sat Feb 21 16:00:00 CET 2009 - lmb@suse.de
+
+- ocfs2_controld-retry-470741.diff: Increase retry count.
+
+-------------------------------------------------------------------
+Fri Feb 20 13:20:00 CET 2009 - lmb@suse.de
+
+- Split off legacy O2CB init scripts and binaries into
+  ocfs2-tools-o2cb.
+
 -------------------------------------------------------------------
 Thu Feb 19 14:47:43 CET 2009 - coyli@suse.de
 

ocfs2-tools.spec

@@ -22,7 +22,7 @@ Name:           ocfs2-tools
 BuildRequires:  e2fsprogs-devel glib2-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.4.1
-Release:        18
+Release:        20
 License:        GPL v2 or later
 Group:          System/Filesystems
 Source:         ocfs2-tools.tar.bz2
@@ -35,6 +35,8 @@ Patch101:       change-quotafile-names.diff
 Patch102:       ocfs2_controld-pacemaker.diff
 Patch103:       ocfs2console-extraoption-fix.diff
 Patch104:       ocfs2console-pop-display-warning.diff
+Patch105:       ocfs2_controld-retry-470741.diff
+Patch106:       tunefs.ocfs2.8.in_more_options.diff
 Url:            http://oss.oracle.com/projects/ocfs2-tools/
 Requires:       net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3
 PreReq:         %insserv_prereq %fillup_prereq
@@ -88,6 +90,24 @@ developing low-level OCFS2-aware applications.
 
 
 
+Authors:
+--------
+    Oracle Corporation
+
+%package o2cb
+License:        GPL v2 or later
+Summary:        Oracle Cluster File System 2 Core Tools
+Group:          System/Filesystems
+Requires:       ocfs2-tools = %{version}
+
+%description o2cb
+OCFS is the Oracle Cluster File System.
+
+This package contains the core user-space tools needed for creating and
+managing the file system.
+
+
+
 Authors:
 --------
     Oracle Corporation
@@ -102,6 +122,8 @@ Authors:
 %patch102 -p1
 %patch103 -p1
 %patch104 -p1
+%patch105 -p1
+%patch106 -p1
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}
@@ -143,11 +165,11 @@ fi
 
 %post -p /sbin/ldconfig
 
-%preun
+%preun o2cb
 %stop_on_removal ocfs2
 %stop_on_removal o2cb
 
-%postun
+%postun o2cb
 /sbin/ldconfig
 %{insserv_cleanup}
 %restart_on_update ocfs2
@@ -161,16 +183,10 @@ fi
 /sbin/mkfs.ocfs2
 /sbin/mounted.ocfs2
 /sbin/tunefs.ocfs2
-/sbin/o2cb_ctl
 /sbin/mount.ocfs2
-/sbin/ocfs2_hb_ctl
-/sbin/rco2cb
-/sbin/rcocfs2
 %{_sbindir}/o2image
 %{_sbindir}/debugfs.ocfs2
 %{_sbindir}/ocfs2_controld.pcmk
-%{_sysconfdir}/init.d/o2cb
-%{_sysconfdir}/init.d/ocfs2
 %config %{_sysconfdir}/udev/rules.d/51-ocfs2.rules
 %{_mandir}/man8/debugfs.ocfs2.8*
 %{_mandir}/man8/fsck.ocfs2.8*
@@ -179,11 +195,7 @@ fi
 %{_mandir}/man8/tunefs.ocfs2.8*
 %{_mandir}/man8/mounted.ocfs2.8*
 %{_mandir}/man8/mount.ocfs2.8*
-%{_mandir}/man8/o2cb_ctl.8*
-%{_mandir}/man8/ocfs2_hb_ctl.8*
-%{_mandir}/man7/o2cb.7.gz
 %{_mandir}/man8/o2image.8.gz
-/var/adm/fillup-templates/sysconfig.o2cb
 %doc README.O2CB COPYING CREDITS MAINTAINERS
 %doc documentation/users_guide.txt
 %dir /usr/lib/ocf
@@ -197,6 +209,19 @@ fi
 %{py_sitedir}/ocfs2interface
 %{_mandir}/man8/ocfs2console.8*
 
+%files o2cb
+%defattr(-,root,root)
+/sbin/rco2cb
+/sbin/rcocfs2
+/sbin/o2cb_ctl
+/sbin/ocfs2_hb_ctl
+%{_sysconfdir}/init.d/o2cb
+%{_sysconfdir}/init.d/ocfs2
+%{_mandir}/man8/o2cb_ctl.8*
+%{_mandir}/man8/ocfs2_hb_ctl.8*
+/var/adm/fillup-templates/sysconfig.o2cb
+%{_mandir}/man7/o2cb.7.gz
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/o2cb
@@ -208,6 +233,14 @@ fi
 %{_libdir}/pkgconfig/ocfs2.pc
 
 %changelog
+* Fri Feb 27 2009 coyli@suse.de
+- tunefs.ocfs2.8.in_more_options.diff: add manual info for
+  -y, -n and --update-cluster-statck options (bnc#478259)
+* Sat Feb 21 2009 lmb@suse.de
+- ocfs2_controld-retry-470741.diff: Increase retry count.
+* Fri Feb 20 2009 lmb@suse.de
+- Split off legacy O2CB init scripts and binaries into
+  ocfs2-tools-o2cb.
 * Thu Feb 19 2009 coyli@suse.de
 - update o2cb.ocf to fix return value format (bnc#474353)
 * Mon Feb 16 2009 coyli@suse.de

ocfs2_controld-retry-470741.diff

@@ -0,0 +1,22 @@
+From: lmb@suse.de
+References: bnc#470741
+
+ocfs2_controld.pcmk does not retry often enough for some situations, and
+thus fails to start. This tentative patch "masks" this by simply
+retrying much more often.
+
+Index: ocfs2-tools/ocfs2_controld/ckpt.c
+===================================================================
+--- ocfs2-tools.orig/ocfs2_controld/ckpt.c
++++ ocfs2-tools/ocfs2_controld/ckpt.c
+@@ -32,8 +32,8 @@
+  * A tentative retry is something we don't want to spend a lot of time on;
+  * it works or we error.  A serious retry we really want to complete.
+  */
+-#define TENTATIVE_RETRY_TRIES	2
+-#define SERIOUS_RETRY_TRIES	5
++#define TENTATIVE_RETRY_TRIES	20
++#define SERIOUS_RETRY_TRIES	50
+ 
+ 
+ 

tunefs.ocfs2.8.in_more_options.diff

@@ -0,0 +1,43 @@
+commit f5939cb6da32352a782e36507b5bef8a8194b26d
+Author: Coly Li <coly.li@suse.de>
+Date:   Tue Feb 24 09:43:04 2009 +0800
+
+    tunefs.ocfs2.8: add info for -y,-n,--update-cluster-stack
+    
+    The manual for tunefs.ocfs2.8.in does not have information for -y, -n and
+    --update-cluster-stack options. This patch adds these info to tuneofs.ocfs2
+    manual.
+    
+    Signed-off-by: Coly Li <coly.li@suse.de>
+    Signed-off-by: Mark Fasheh <mfasheh@suse.com>
+
+diff --git a/tunefs.ocfs2/tunefs.ocfs2.8.in b/tunefs.ocfs2/tunefs.ocfs2.8.in
+index 7a9b66b..b49a00f 100644
+--- a/tunefs.ocfs2/tunefs.ocfs2.8.in
++++ b/tunefs.ocfs2/tunefs.ocfs2.8.in
+@@ -90,6 +90,14 @@ Verbose mode.
+ Show version and exit.
+ 
+ .TP
++\fB\-y, \-\-yes\fR
++Alway answer Yes in interactive command line.
++
++.TP
++\fB\-n, \-\-no\fR
++Always answer No in interactive command line.
++
++.TP
+ \fB\-\-backup\-super\fR
+ Backs up the superblock to fixed offsets (1G, 4G, 16G, 64G, 256G and 1T)
+ on disk. This option is useful for users to backup the superblock on volumes
+@@ -102,6 +110,10 @@ facility.
+ Lists the files having holes. This option is useful when disabling the \fIsparse\fR feature.
+ 
+ .TP
++\fB\-\-update-cluster-stack\fR
++Updating on-disk cluster information to match the running cluster.
++
++.TP
+ \fIblocks-count\fR
+ During resize, \fBtunefs.ocfs2\fR automatically determines the size of the given
+ device and grows the file system such that it uses all of the available space on