pool/ocfs2-tools
4
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
OBS User unknown 2009-04-16 00:18:21 +00:00 committed by Git OBS Bridge
parent 1901d0d4c1
commit e215397b54
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ocfs2-devel.diff
View File

@ -1,6 +1,6 @@
--- upstream/ocfs2_controld/main.c 2008-10-27 14:55:50.000000000 +0100 --- ocfs2-tools/ocfs2_controld/main.c
+++ dev/ocfs2_controld/main.c 2008-10-27 14:57:24.000000000 +0100 +++ ocfs2-tools/ocfs2_controld/main.c
@@ -1027,6 +1027,7 @@ static void lockfile(void) @@ -1027,6 +1027,7 @@
static void daemonize(void) static void daemonize(void)
{ {
@ -8,7 +8,7 @@
pid_t pid = fork(); pid_t pid = fork();
if (pid < 0) { if (pid < 0) {
perror("main: cannot fork"); perror("main: cannot fork");
@@ -1040,7 +1041,19 @@ static void daemonize(void) @@ -1040,6 +1041,18 @@
close(0); close(0);
close(1); close(1);
close(2); close(2);
@ -27,9 +27,8 @@
openlog("ocfs2_controld", LOG_PID, LOG_DAEMON); openlog("ocfs2_controld", LOG_PID, LOG_DAEMON);
lockfile(); lockfile();
--- ocfs2-tools/vendor/common/o2cb.init.sh
--- upstream/vendor/common/o2cb.init.sh 2008-09-11 16:51:11.000000000 +0200 +++ ocfs2-tools/vendor/common/o2cb.init.sh
+++ dev/vendor/common/o2cb.init.sh 2008-10-23 14:36:49.000000000 +0200
@@ -8,7 +8,8 @@ @@ -8,7 +8,8 @@
# Provides: o2cb # Provides: o2cb
# Required-Start: $network # Required-Start: $network
@ -40,7 +39,7 @@
# Default-Start: 2 3 5 # Default-Start: 2 3 5
# Default-Stop: # Default-Stop:
# Short-Description: Load O2CB cluster services at system boot. # Short-Description: Load O2CB cluster services at system boot.
@@ -653,7 +654,7 @@ status_filesystem() @@ -653,7 +654,7 @@
status_daemon() status_daemon()
{ {
@ -49,7 +48,7 @@
echo -n "Checking for control daemon: " echo -n "Checking for control daemon: "
if [ -n "$(pidofproc "$DAEMON")" ] if [ -n "$(pidofproc "$DAEMON")" ]
then then
@@ -667,7 +668,7 @@ status_daemon() @@ -667,7 +668,7 @@
bringup_daemon() bringup_daemon()
{ {
@ -58,7 +57,7 @@
echo -n "Starting $(basename "$DAEMON"): " echo -n "Starting $(basename "$DAEMON"): "
start_daemon "$DAEMON" start_daemon "$DAEMON"
[ $? != 0 ] && return 1 [ $? != 0 ] && return 1
@@ -682,6 +683,7 @@ bringup_daemon() @@ -682,6 +683,7 @@
fi fi
sleep 1 sleep 1
done done
@ -66,7 +65,7 @@
return 0 return 0
} }
@@ -689,7 +691,7 @@ bringup_daemon() @@ -689,7 +691,7 @@
kill_daemon() kill_daemon()
{ {
SIGNAL="$1" SIGNAL="$1"
@ -75,8 +74,8 @@
status_daemon >/dev/null 2>&1 || return 2 status_daemon >/dev/null 2>&1 || return 2
--- upstream/vendor/common/ocfs2.init 2008-09-11 16:51:11.000000000 +0200 --- ocfs2-tools/vendor/common/ocfs2.init
+++ dev/vendor/common/ocfs2.init 2008-10-23 13:13:55.000000000 +0200 +++ ocfs2-tools/vendor/common/ocfs2.init
@@ -8,9 +8,9 @@ @@ -8,9 +8,9 @@
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: ocfs2 # Provides: ocfs2

5
ocfs2-tools.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Apr 16 01:40:48 CEST 2009 - ro@suse.de
- buildfix: refresh patches
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 27 03:53:53 CET 2009 - coyli@suse.de Fri Feb 27 03:53:53 CET 2009 - coyli@suse.de

8
ocfs2-tools.spec
View File

@ -22,8 +22,8 @@ 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 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 Summary: Oracle Cluster File System 2 Core Tools
Version: 1.4.1 Version: 1.4.1
Release: 20 Release: 22
License: GPL v2 or later License: GPL v2 only; GPL v2 or later
Group: System/Filesystems Group: System/Filesystems
Source: ocfs2-tools.tar.bz2 Source: ocfs2-tools.tar.bz2
Source1: o2cb.ocf Source1: o2cb.ocf
@ -233,6 +233,8 @@ fi
%{_libdir}/pkgconfig/ocfs2.pc %{_libdir}/pkgconfig/ocfs2.pc
%changelog %changelog
* Thu Apr 16 2009 ro@suse.de
- buildfix: refresh patches
* Fri Feb 27 2009 coyli@suse.de * Fri Feb 27 2009 coyli@suse.de
- tunefs.ocfs2.8.in_more_options.diff: add manual info for - tunefs.ocfs2.8.in_more_options.diff: add manual info for
-y, -n and --update-cluster-statck options (bnc#478259) -y, -n and --update-cluster-statck options (bnc#478259)
@ -344,7 +346,7 @@ fi
- Should-Start: iscsi added (from SLES9) (#114733) - Should-Start: iscsi added (from SLES9) (#114733)
* Wed Nov 02 2005 dmueller@suse.de * Wed Nov 02 2005 dmueller@suse.de
- don't build as root - don't build as root
* Tue Nov 01 2005 jeffm@suse.com * Wed Nov 02 2005 jeffm@suse.com
- Update to version 1.1.3 - SVN 1105 - Update to version 1.1.3 - SVN 1105
* Mon Aug 22 2005 garloff@suse.de * Mon Aug 22 2005 garloff@suse.de
- Fix python defines. - Fix python defines.