pool/ocfs2-tools
3
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=9

Browse Source
This commit is contained in:
OBS User unknown 2008-10-27 16:04:21 +00:00 committed by Git OBS Bridge
parent d93951204b
commit f0d1aa9b20
6 changed files with 133 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
ocfs2-devel.diff
View File

@ -1,6 +1,36 @@
diff -upb -ur ocfs2-tools/ocfs2_controld/pacemaker.c upstream/ocfs2_controld/pacemaker.c
--- ocfs2-tools/ocfs2_controld/pacemaker.c 2008-08-21 02:49:41.000000000 +0200
+++ upstream/ocfs2_controld/pacemaker.c 2008-09-09 23:52:32.000000000 +0200
Only in upstream: .gitignore
Only in dev: .hgtags
--- 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)
static void daemonize(void)
{
+ int fd;
pid_t pid = fork();
if (pid < 0) {
perror("main: cannot fork");
@@ -1040,6 +1041,18 @@ static void daemonize(void)
close(0);
close(1);
close(2);
+ fd = open("/dev/null", O_RDWR);
+ if (fd >= 0) {
+ /* dup2 to 0 / 1 / 2 (stdin / stdout / stderr) */
+ dup2(fd, STDIN_FILENO); /* 0 */
+ dup2(fd, STDOUT_FILENO); /* 1 */
+ dup2(fd, STDERR_FILENO); /* 2 */
+
+ /* Should be 0, but just in case it isn't... */
+ if (fd > 2) {
+ close(fd);
+ }
+ }
openlog("ocfs2_controld", LOG_PID, LOG_DAEMON);
lockfile();
--- upstream/ocfs2_controld/pacemaker.c 2008-09-11 16:51:11.000000000 +0200
+++ dev/ocfs2_controld/pacemaker.c 2008-10-23 13:14:56.000000000 +0200
@@ -20,8 +20,16 @@
#include <unistd.h>
#include <syslog.h>
@ -30,3 +60,67 @@ diff -upb -ur ocfs2-tools/ocfs2_controld/pacemaker.c upstream/ocfs2_controld/pac
#include <sys/utsname.h>
int our_nodeid = 0;
Only in dev: static.patch
Only in dev/tunefs.ocfs2: Makefile.rej
--- 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
@@ -8,7 +8,8 @@
# Provides: o2cb
# Required-Start: $network
# Should-Start:
-# Required-Stop:
+# Should-Stop:
+# Required-Stop: $null
# 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
@@ -682,6 +683,7 @@ bringup_daemon()
fi
sleep 1
done
+ sleep 2
return 0
}
@@ -689,7 +691,7 @@ bringup_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
--- 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
@@ -8,9 +8,9 @@
### BEGIN INIT INFO
# Provides: ocfs2
# Required-Start: $network o2cb
-# Required-Stop:
-# X-UnitedLinux-Should-Start:
-# X-UnitedLinux-Should-Stop:
+# Required-Stop: $null
+# Should-Start:
+# Should-Stop:
# Default-Start: 2 3 5
# Default-Stop:
# Short-Description: Mount OCFS2 volumes at boot.

56
ocfs2-init.diff
View File

@ -1,56 +0,0 @@
diff -r bfc9de4afd43 vendor/common/o2cb.init.sh
--- a/vendor/common/o2cb.init.sh Mon Aug 25 09:56:08 2008 +0000
+++ b/vendor/common/o2cb.init.sh Tue Sep 09 17:37:18 2008 +0200
@@ -8,7 +8,8 @@
# Provides: o2cb
# Required-Start: $network
# Should-Start:
-# Required-Stop:
+# Should-Stop:
+# Required-Stop: $null
# 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
@@ -8,9 +8,9 @@
### BEGIN INIT INFO
# Provides: ocfs2
# Required-Start: $network o2cb
-# Required-Stop:
-# X-UnitedLinux-Should-Start:
-# X-UnitedLinux-Should-Stop:
+# Required-Stop: $null
+# Should-Start:
+# Should-Stop:
# Default-Start: 2 3 5
# Default-Stop:
# Short-Description: Mount OCFS2 volumes at boot.

11
ocfs2-tools-static-glib.diff
View File

@ -9,14 +9,3 @@ diff -ru ocfs2-tools/o2cb_ctl/Makefile ocfs2-tools.fix/o2cb_ctl/Makefile
+ $(LINK) $(LIBO2CB_LIBS) -Wl,-Bstatic $(GLIB_LIBS) -Wl,-Bdynamic $(LIBOCFS2_LIBS) $(COM_ERR_LIBS)
include $(TOPDIR)/Postamble.make
diff -ru ocfs2-tools/tunefs.ocfs2/Makefile ocfs2-tools.fix/tunefs.ocfs2/Makefile
--- ocfs2-tools/tunefs.ocfs2/Makefile 2008-02-19 15:02:38.000000000 -0500
+++ ocfs2-tools.fix/tunefs.ocfs2/Makefile 2008-02-19 15:02:00.000000000 -0500
@@ -39,6 +39,6 @@
DIST_FILES = $(CFILES) $(HFILES) tunefs.ocfs2.8.in
tunefs.ocfs2: $(OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS)
- $(LINK) $(GLIB_LIBS) $(LIBOCFS2_LIBS) $(UUID_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS)
+ $(LINK) -Wl,-Bstatic $(GLIB_LIBS) -Wl,-Bdynamic $(LIBOCFS2_LIBS) $(UUID_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS)
include $(TOPDIR)/Postamble.make

18
ocfs2-tools.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Mon Oct 27 14:58:59 CET 2008 - abeekhof@suse.de
- Refresh package to upstream a93731c164d024e0016520a1f4cd8f9007d7c05e
- Remove part of the static glib patch as tunefs.ocfs2 no longer uses glib
- Combine patches yet to be upstreamed to ease maintenance
-------------------------------------------------------------------
Mon Oct 20 21:08:34 CEST 2008 - abeekhof@suse.de
- New patch for ocfs2_controld - make sure stad(err|out|in) are mapped to /dev/null
and not left unassigned (which causes issues when logging)
-------------------------------------------------------------------
Mon Sep 22 11:41:51 CEST 2008 - abeekhof@suse.de
- ocfs2console: Allow ocfs2console to enumerate device mapper devices (bnc#414756)
-------------------------------------------------------------------
Tue Sep 16 22:14:09 CEST 2008 - abeekhof@suse.de

25
ocfs2-tools.spec
View File

@ -22,13 +22,12 @@ 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: 2
Release: 3
License: GPL v2 or later
Group: System/Filesystems
Source: ocfs2-tools.tar.bz2
Patch5: ocfs2-tools-static-glib.diff
Patch99: ocfs2-devel.diff
Patch100: ocfs2-init.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
@ -89,7 +88,6 @@ Authors:
%setup -n %{name}
%patch5 -p1
%patch99 -p1
%patch100 -p1
%build
%{?suse_update_config:%{suse_update_config -f}}
@ -189,7 +187,16 @@ fi
%{_libdir}/pkgconfig/ocfs2.pc
%changelog
* Wed Sep 17 2008 abeekhof@suse.de
* Mon Oct 27 2008 abeekhof@suse.de
- Refresh package to upstream a93731c164d024e0016520a1f4cd8f9007d7c05e
- Remove part of the static glib patch as tunefs.ocfs2 no longer uses glib
- Combine patches yet to be upstreamed to ease maintenance
* Mon Oct 20 2008 abeekhof@suse.de
- New patch for ocfs2_controld - make sure stad(err|out|in) are mapped to /dev/null
and not left unassigned (which causes issues when logging)
* Mon Sep 22 2008 abeekhof@suse.de
- ocfs2console: Allow ocfs2console to enumerate device mapper devices (bnc#414756)
* Tue Sep 16 2008 abeekhof@suse.de
- Update for new pacemaker dependancies
- Use correct path for ocfs2_controld.*
- Package required udev rules
@ -207,7 +214,7 @@ fi
- Statically link glib-2.0 with tunefs and o2cb_ctl.
* Mon Jan 28 2008 jeffm@suse.com
- Update to 1.3.9
* Tue Jan 15 2008 jeffm@suse.com
* Mon Jan 14 2008 jeffm@suse.com
- Update to 1.2.7
- Add shrinking journal size support
- Fix crash in slotmap
@ -221,14 +228,14 @@ fi
- Multiple fsck fixes
- Offline resize
- Documentation updates
* Mon Nov 20 2006 schwab@suse.de
* Sun Nov 19 2006 schwab@suse.de
- Don't use kernel headers.
* Mon Nov 20 2006 ro@suse.de
* Sun Nov 19 2006 ro@suse.de
- define offsetof locally if it does not come from kernel header
* Mon Oct 30 2006 lmb@suse.de
- Upgrade to version 1.2.2 to match in-kernel version.
- Split-off devel subpackage.
* Sun Oct 29 2006 meissner@suse.de
* Sat Oct 28 2006 meissner@suse.de
- use RPM_OPT_FLAGS
* Sat Sep 30 2006 aj@suse.de
- Cleanup BuildRequires.
@ -252,7 +259,7 @@ fi
- converted neededforbuild to BuildRequires
* Fri Nov 11 2005 lmb@suse.de
- Should-Start: iscsi added (from SLES9) (#114733)
* Thu Nov 03 2005 dmueller@suse.de
* Wed Nov 02 2005 dmueller@suse.de
- don't build as root
* Wed Nov 02 2005 jeffm@suse.com
- Update to version 1.1.3 - SVN 1105

4
ocfs2-tools.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fb8d688bbced56bb6c710365f8815eb5dc569b456bf72c83e21566f0c87f7948
size 1082572
oid sha256:147650748b00a969091b68886cfbaf1dea85e6912f709a76ab599f00ad576ece
size 1103130