This commit is contained in:
parent
1901d0d4c1
commit
e215397b54
@ -1,6 +1,6 @@
|
||||
--- upstream/ocfs2_controld/main.c 2008-10-27 14:55:50.000000000 +0100
|
||||
+++ dev/ocfs2_controld/main.c 2008-10-27 14:57:24.000000000 +0100
|
||||
@@ -1027,6 +1027,7 @@ static void lockfile(void)
|
||||
--- ocfs2-tools/ocfs2_controld/main.c
|
||||
+++ ocfs2-tools/ocfs2_controld/main.c
|
||||
@@ -1027,6 +1027,7 @@
|
||||
|
||||
static void daemonize(void)
|
||||
{
|
||||
@ -8,7 +8,7 @@
|
||||
pid_t pid = fork();
|
||||
if (pid < 0) {
|
||||
perror("main: cannot fork");
|
||||
@@ -1040,7 +1041,19 @@ static void daemonize(void)
|
||||
@@ -1040,6 +1041,18 @@
|
||||
close(0);
|
||||
close(1);
|
||||
close(2);
|
||||
@ -27,9 +27,8 @@
|
||||
openlog("ocfs2_controld", LOG_PID, LOG_DAEMON);
|
||||
|
||||
lockfile();
|
||||
|
||||
--- upstream/vendor/common/o2cb.init.sh 2008-09-11 16:51:11.000000000 +0200
|
||||
+++ dev/vendor/common/o2cb.init.sh 2008-10-23 14:36:49.000000000 +0200
|
||||
--- ocfs2-tools/vendor/common/o2cb.init.sh
|
||||
+++ ocfs2-tools/vendor/common/o2cb.init.sh
|
||||
@@ -8,7 +8,8 @@
|
||||
# Provides: o2cb
|
||||
# Required-Start: $network
|
||||
@ -40,7 +39,7 @@
|
||||
# Default-Start: 2 3 5
|
||||
# Default-Stop:
|
||||
# Short-Description: Load O2CB cluster services at system boot.
|
||||
@@ -653,7 +654,7 @@ status_filesystem()
|
||||
@@ -653,7 +654,7 @@
|
||||
|
||||
status_daemon()
|
||||
{
|
||||
@ -49,7 +48,7 @@
|
||||
echo -n "Checking for control daemon: "
|
||||
if [ -n "$(pidofproc "$DAEMON")" ]
|
||||
then
|
||||
@@ -667,7 +668,7 @@ status_daemon()
|
||||
@@ -667,7 +668,7 @@
|
||||
|
||||
bringup_daemon()
|
||||
{
|
||||
@ -58,7 +57,7 @@
|
||||
echo -n "Starting $(basename "$DAEMON"): "
|
||||
start_daemon "$DAEMON"
|
||||
[ $? != 0 ] && return 1
|
||||
@@ -682,6 +683,7 @@ bringup_daemon()
|
||||
@@ -682,6 +683,7 @@
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
@ -66,7 +65,7 @@
|
||||
|
||||
return 0
|
||||
}
|
||||
@@ -689,7 +691,7 @@ bringup_daemon()
|
||||
@@ -689,7 +691,7 @@
|
||||
kill_daemon()
|
||||
{
|
||||
SIGNAL="$1"
|
||||
@ -75,8 +74,8 @@
|
||||
|
||||
status_daemon >/dev/null 2>&1 || return 2
|
||||
|
||||
--- upstream/vendor/common/ocfs2.init 2008-09-11 16:51:11.000000000 +0200
|
||||
+++ dev/vendor/common/ocfs2.init 2008-10-23 13:13:55.000000000 +0200
|
||||
--- ocfs2-tools/vendor/common/ocfs2.init
|
||||
+++ ocfs2-tools/vendor/common/ocfs2.init
|
||||
@@ -8,9 +8,9 @@
|
||||
### BEGIN INIT INFO
|
||||
# Provides: ocfs2
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
Summary: Oracle Cluster File System 2 Core Tools
|
||||
Version: 1.4.1
|
||||
Release: 20
|
||||
License: GPL v2 or later
|
||||
Release: 22
|
||||
License: GPL v2 only; GPL v2 or later
|
||||
Group: System/Filesystems
|
||||
Source: ocfs2-tools.tar.bz2
|
||||
Source1: o2cb.ocf
|
||||
@ -233,6 +233,8 @@ fi
|
||||
%{_libdir}/pkgconfig/ocfs2.pc
|
||||
|
||||
%changelog
|
||||
* Thu Apr 16 2009 ro@suse.de
|
||||
- buildfix: refresh patches
|
||||
* 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)
|
||||
@ -344,7 +346,7 @@ fi
|
||||
- Should-Start: iscsi added (from SLES9) (#114733)
|
||||
* Wed Nov 02 2005 dmueller@suse.de
|
||||
- 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
|
||||
* Mon Aug 22 2005 garloff@suse.de
|
||||
- Fix python defines.
|
||||
|
Loading…
x
Reference in New Issue
Block a user