diff --git a/o2cb.ocf b/o2cb.ocf index 88f3e81..dd3445e 100644 --- a/o2cb.ocf +++ b/o2cb.ocf @@ -380,12 +380,11 @@ meta_data() { cat < - + 1.0 - pingd resource agent + o2cb resource agent -This is a pingd Resource Agent. -It records (in the CIB) the current number of ping nodes a node can connect to. +This is a o2cb Resource Agent. It runs o2cb daemon as a instance of anonymous clone. diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes index 24ffd66..3d54a25 100644 --- a/ocfs2-tools.changes +++ b/ocfs2-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 5 01:00:12 CST 2008 - coyli@suse.de + +- ensure o2cb OCF resource agent is executable +- add libdlm to ocfs2-tools' dependency (bnc#448751) + ------------------------------------------------------------------- Sat Nov 22 02:37:05 CET 2008 - mfasheh@suse.com diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index 93e9eeb..1fbd28e 100644 --- a/ocfs2-tools.spec +++ b/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: 6 +Release: 7 License: GPL v2 or later Group: System/Filesystems Source: ocfs2-tools.tar.bz2 @@ -36,6 +36,7 @@ Requires: net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3 PreReq: %insserv_prereq %fillup_prereq AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: libdlm %description OCFS is the Oracle Cluster File System. @@ -113,6 +114,7 @@ cp -f vendor/common/o2cb.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/o2cb cp -f vendor/common/ocfs2.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ocfs2 cp -f vendor/common/51-ocfs2.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d cp -f $RPM_SOURCE_DIR/o2cb.ocf $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/ocfs2/o2cb +chmod a+x $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/ocfs2/o2cb cp -f vendor/common/o2cb.sysconfig ${RPM_BUILD_ROOT}/var/adm/fillup-templates/sysconfig.o2cb ln -sf ..%{_sysconfdir}/init.d/o2cb $RPM_BUILD_ROOT/sbin/rco2cb ln -sf ..%{_sysconfdir}/init.d/ocfs2 $RPM_BUILD_ROOT/sbin/rcocfs2 @@ -198,7 +200,10 @@ fi %{_libdir}/pkgconfig/ocfs2.pc %changelog -* Sat Nov 22 2008 mfasheh@suse.com +* Fri Dec 05 2008 coyli@suse.de +- ensure o2cb OCF resource agent is executable +- add libdlm to ocfs2-tools' dependency (bnc#448751) +* Fri Nov 21 2008 mfasheh@suse.com - Add a quota fixup patch to match up system file names in tools with the kernel. * Wed Nov 12 2008 abeekhof@suse.de @@ -268,9 +273,9 @@ fi - Create /sbin/rcocfs2, rco2cb symlinks (#167261). * Tue Apr 04 2006 lmb@suse.de - Install "ocfs2" init script and enable it (#160724). -* Fri Mar 03 2006 jeffm@suse.com +* Thu Mar 02 2006 jeffm@suse.com - Updated to version 1.2.0, per Oracle -* Fri Mar 03 2006 jeffm@suse.com +* Thu Mar 02 2006 jeffm@suse.com - Enabled o2cb by default on package install to allow it to shut down when manually started. Otherwise, the system will hang during shutdown.