Hello community, here is the log from the commit of package ocfs2-tools checked in at Wed Sep 24 17:16:39 CEST 2008. -------- --- ocfs2-tools/ocfs2-tools.changes 2008-09-13 14:19:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/ocfs2-tools/ocfs2-tools.changes 2008-09-16 22:28:26.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 16 22:14:09 CEST 2008 - abeekhof@suse.de + +- Update for new pacemaker dependancies +- Use correct path for ocfs2_controld.* +- Package required udev rules + +------------------------------------------------------------------- Old: ---- blkid.m4.diff ocfs2-tools-1.2.7-tunefs-path.diff ocfs2-tools-o_creat-mode.diff ocfs2-tools-suse.diff offsetof.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocfs2-tools.spec ++++++ --- /var/tmp/diff_new_pack.J18106/_old 2008-09-24 17:16:30.000000000 +0200 +++ /var/tmp/diff_new_pack.J18106/_new 2008-09-24 17:16:30.000000000 +0200 @@ -19,23 +19,18 @@ Name: ocfs2-tools -BuildRequires: e2fsprogs-devel glib2-devel heartbeat-common-devel libdlm-devel libxml2-devel libxslt-devel openais-devel pacemaker-devel >= 0.7.1 python-devel python-gtk-devel readline-devel update-desktop-files +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: 1 +Release: 2 License: GPL v2 or later Group: System/Filesystems Source: ocfs2-tools.tar.bz2 -Patch0: ocfs2-tools-suse.diff -Patch1: blkid.m4.diff -Patch2: offsetof.diff -Patch3: ocfs2-tools-o_creat-mode.diff -Patch4: ocfs2-tools-1.2.7-tunefs-path.diff Patch5: ocfs2-tools-static-glib.diff Patch99: ocfs2-devel.diff Patch100: ocfs2-init.diff Url: http://oss.oracle.com/projects/ocfs2-tools/ -Requires: coreutils, net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3 +Requires: net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3 PreReq: %insserv_prereq %fillup_prereq AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,7 +55,6 @@ Requires: ocfs2-tools = %{version} AutoReqProv: No Requires: e2fsprogs, glib2 >= 2.2.3, vte >= 0.11.10, python-gtk >= 1.99.16, ocfs2-tools = %{version} -%{py_requires} %description -n ocfs2console OCFS is the Oracle Cluster Filesystem. @@ -109,8 +103,10 @@ %install mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/ 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/ ln -sf ..%{_sysconfdir}/init.d/o2cb $RPM_BUILD_ROOT/sbin/rco2cb ln -sf ..%{_sysconfdir}/init.d/ocfs2 $RPM_BUILD_ROOT/sbin/rcocfs2 mkdir -p ${RPM_BUILD_ROOT}/var/adm/fillup-templates @@ -130,28 +126,26 @@ rm -rf $RPM_BUILD_ROOT fi -%post -%run_ldconfig -%{fillup_and_insserv -n -y -Y o2cb o2cb} -%{fillup_and_insserv -n -y -Y ocfs2 ocfs2} +%post -p /sbin/ldconfig %preun %stop_on_removal ocfs2 %stop_on_removal o2cb %postun -%run_ldconfig +/sbin/ldconfig +%{insserv_cleanup} %restart_on_update ocfs2 %restart_on_update o2cb -%{insserv_cleanup} %files %defattr(-,root,root) +%dir %{_sysconfdir}/udev +%dir %{_sysconfdir}/udev/rules.d /sbin/fsck.ocfs2 /sbin/mkfs.ocfs2 /sbin/mounted.ocfs2 /sbin/tunefs.ocfs2 -/sbin/tunefs.ocfs2 /sbin/o2cb_ctl /sbin/mount.ocfs2 /sbin/ocfs2_hb_ctl @@ -162,6 +156,7 @@ %{_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* %{_mandir}/man8/fsck.ocfs2.checks.8* @@ -194,6 +189,10 @@ %{_libdir}/pkgconfig/ocfs2.pc %changelog +* Wed Sep 17 2008 abeekhof@suse.de +- Update for new pacemaker dependancies +- Use correct path for ocfs2_controld.* +- Package required udev rules * Thu Sep 11 2008 abeekhof@suse.de - Refresh from upstream 1.4.1 (0ead2f1b45568ca441cb3ed679efbbd7eeb68d98) - Add support for OpenAIS/Pacemaker (userspace cluster stack) integration ++++++ ocfs2-init.diff ++++++ --- /var/tmp/diff_new_pack.J18106/_old 2008-09-24 17:16:30.000000000 +0200 +++ /var/tmp/diff_new_pack.J18106/_new 2008-09-24 17:16:30.000000000 +0200 @@ -11,6 +11,33 @@ # Default-Start: 2 3 5 # Default-Stop: # Short-Description: Load O2CB cluster services at system boot. +@@ -653,7 +654,7 @@ status_filesystem() + + status_daemon() + { +- DAEMON="/sbin/ocfs2_controld.${O2CB_STACK}" ++ DAEMON="/usr/sbin/ocfs2_controld.${O2CB_STACK}" + echo -n "Checking for control daemon: " + if [ -n "$(pidofproc "$DAEMON")" ] + then +@@ -667,7 +668,7 @@ status_daemon() + + bringup_daemon() + { +- DAEMON="/sbin/ocfs2_controld.${O2CB_STACK}" ++ DAEMON="/usr/sbin/ocfs2_controld.${O2CB_STACK}" + echo -n "Starting $(basename "$DAEMON"): " + start_daemon "$DAEMON" + [ $? != 0 ] && return 1 +@@ -689,7 +690,7 @@ kill_daemon() + kill_daemon() + { + SIGNAL="$1" +- DAEMON="/sbin/ocfs2_controld.${O2CB_STACK}" ++ DAEMON="/usr/sbin/ocfs2_controld.${O2CB_STACK}" + + status_daemon >/dev/null 2>&1 || return 2 + diff -r bfc9de4afd43 vendor/common/ocfs2.init --- a/vendor/common/ocfs2.init Mon Aug 25 09:56:08 2008 +0000 +++ b/vendor/common/ocfs2.init Tue Sep 09 17:37:18 2008 +0200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org