cluster: RHEL55 - init: change default run options
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 1181c15ba197897c551b8830868b850a35e29104
Parent: f78923b5bac35cf77b41683d50ace6622afae0e0
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Wed Mar 10 14:08:17 2010 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Wed Mar 10 14:08:17 2010 +0100
init: change default run options
from RHEL5.5 distcvs
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
gfs2/init.d/gfs2 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gfs2/init.d/gfs2 b/gfs2/init.d/gfs2
index cafe341..d93b082 100755
--- a/gfs2/init.d/gfs2
+++ b/gfs2/init.d/gfs2
@@ -2,7 +2,7 @@
#
#
#
-# chkconfig: 345 26 74
+# chkconfig: - 26 74
# description: mount/unmount gfs2 filesystems configured in /etc/fstab
#
#
14 years, 1 month
cluster: RHEL55 - init: change default run options
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: f78923b5bac35cf77b41683d50ace6622afae0e0
Parent: dcd865b1e202c82cc389acc02d91663d4d066656
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Wed Mar 10 14:04:45 2010 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Wed Mar 10 14:04:45 2010 +0100
init: change default run options
from RHEL5.5 distcvs
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
gfs/init.d/gfs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gfs/init.d/gfs b/gfs/init.d/gfs
index c4ee890..bef1ce3 100755
--- a/gfs/init.d/gfs
+++ b/gfs/init.d/gfs
@@ -2,7 +2,7 @@
#
#
#
-# chkconfig: 345 26 74
+# chkconfig: - 26 74
# description: mount/unmount gfs filesystems configured in /etc/fstab
#
#
14 years, 1 month
cluster: RHEL55 - fence: remove invalid man page option
by Christine Caulfield
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: dcd865b1e202c82cc389acc02d91663d4d066656
Parent: 9e93356cd52aae9ba69b9dabe6ffcf4af4feb2b9
Author: Christine Caulfield <ccaulfie(a)redhat.com>
AuthorDate: Wed Mar 10 12:05:31 2010 +0000
Committer: Christine Caulfield <ccaulfie(a)redhat.com>
CommitterDate: Wed Mar 10 12:05:31 2010 +0000
fence: remove invalid man page option
sync with RHEL5.5 distcvs
Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com>
---
fence/man/fence_scsi.8 | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/fence/man/fence_scsi.8 b/fence/man/fence_scsi.8
index 78c1145..8a2d5a8 100644
--- a/fence/man/fence_scsi.8
+++ b/fence/man/fence_scsi.8
@@ -96,9 +96,6 @@ This option is used by fence_node(8) and is ignored by fence_scsi.
\fInodename = < hostname | ip >\fR
Name of the node to be fenced.
.TP
-\fIself = < nodename >\fR
-Name of the node that will perform the fencing operation.
-.TP
\fIverbose = < param >\fR
Verbose output.
14 years, 1 month
cluster: RHEL55 - cman: allow rpmbuild to generate debuginfo for cman
by Christine Caulfield
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 9e93356cd52aae9ba69b9dabe6ffcf4af4feb2b9
Parent: 78c1cf24ac1f6dfeb3c41d95fda988747af08b30
Author: Christine Caulfield <ccaulfie(a)redhat.com>
AuthorDate: Wed Mar 10 11:46:54 2010 +0000
Committer: Christine Caulfield <ccaulfie(a)redhat.com>
CommitterDate: Wed Mar 10 11:46:54 2010 +0000
cman: allow rpmbuild to generate debuginfo for cman
from RHEL5.5 distcvs
Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com>
---
cman/daemon/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cman/daemon/Makefile b/cman/daemon/Makefile
index 90f997c..3e6f1f7 100644
--- a/cman/daemon/Makefile
+++ b/cman/daemon/Makefile
@@ -59,7 +59,7 @@ logging.o: logging.c list.h cnxman-socket.h cnxman-private.h
install: all
install -d ${libexecdir}/lcrso
- install -s service_cman.lcrso ${libexecdir}/lcrso
+ install -m755 service_cman.lcrso ${libexecdir}/lcrso
uninstall:
rm -f ${libexecdir}/lcrso/service_cman.lcrso
14 years, 1 month
cluster: RHEL55 - init: change default run options
by Christine Caulfield
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 78c1cf24ac1f6dfeb3c41d95fda988747af08b30
Parent: 7fcb77282d21ebdf7cf24c166ad610aaa5f70b02
Author: Christine Caulfield <ccaulfie(a)redhat.com>
AuthorDate: Wed Mar 10 11:46:03 2010 +0000
Committer: Christine Caulfield <ccaulfie(a)redhat.com>
CommitterDate: Wed Mar 10 11:46:03 2010 +0000
init: change default run options
from RHEL5.5 distcvs
Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com>
---
cman/init.d/cman | 2 +-
cman/init.d/qdiskd | 2 +-
fence/agents/scsi/scsi_reserve | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cman/init.d/cman b/cman/init.d/cman
index 78cc6ce..b59216a 100755
--- a/cman/init.d/cman
+++ b/cman/init.d/cman
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# chkconfig: 345 21 79
+# chkconfig: - 21 79
# description: Starts and stops cman
#
#
diff --git a/cman/init.d/qdiskd b/cman/init.d/qdiskd
index 35972ad..b32462c 100755
--- a/cman/init.d/qdiskd
+++ b/cman/init.d/qdiskd
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# chkconfig: 345 22 78
+# chkconfig: - 22 78
# description: Starts and stops the quroum disk daemon
#
#
diff --git a/fence/agents/scsi/scsi_reserve b/fence/agents/scsi/scsi_reserve
index 4262fbc..b016e86 100755
--- a/fence/agents/scsi/scsi_reserve
+++ b/fence/agents/scsi/scsi_reserve
@@ -2,7 +2,7 @@
#
# scsi_reserve:
#
-# chkconfig: 345 25 75
+# chkconfig: - 25 75
# description: start/stop persistent reservation service for lvm
# config: /etc/sysconfig/scsi_reserve
14 years, 1 month
cluster: RHEL55 - group: Makefile fixes from RHEL5.5 CVS
by Christine Caulfield
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 7fcb77282d21ebdf7cf24c166ad610aaa5f70b02
Parent: 30f8df5a6d2dce99b66d21fcd2bd7a3e3d247a89
Author: Christine Caulfield <ccaulfie(a)redhat.com>
AuthorDate: Wed Mar 10 11:38:33 2010 +0000
Committer: Christine Caulfield <ccaulfie(a)redhat.com>
CommitterDate: Wed Mar 10 11:38:33 2010 +0000
group: Makefile fixes from RHEL5.5 CVS
Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com>
---
group/lib/Makefile | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/group/lib/Makefile b/group/lib/Makefile
index fb86073..e9a9077 100644
--- a/group/lib/Makefile
+++ b/group/lib/Makefile
@@ -18,7 +18,7 @@ STATICLIB=$(LIBNAME).a
top_srcdir=..
UNINSTALL=${top_srcdir}/scripts/uninstall.pl
-# include ${top_srcdir}/make/defines.mk
+include ${top_srcdir}/make/defines.mk
CFLAGS += -g -O -I. -fPIC -I../daemon
@@ -32,6 +32,10 @@ libgroup.o: libgroup.c
$(CC) $(CFLAGS) -c -o $@ $< -I../daemon
install: all
+ install -d ${incdir}
+ install libgroup.h ${incdir}
+ install -d ${libdir}
+ install $(LIBNAME).a ${libdir}
uninstall:
14 years, 1 month
cluster: RHEL55 - fence_scsi: Accept unknown option from standard input
by Christine Caulfield
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 30f8df5a6d2dce99b66d21fcd2bd7a3e3d247a89
Parent: 90946b7f6b4bd8b4b03560b982bc5ca141d2b374
Author: Christine Caulfield <ccaulfie(a)redhat.com>
AuthorDate: Wed Mar 10 11:34:44 2010 +0000
Committer: Christine Caulfield <ccaulfie(a)redhat.com>
CommitterDate: Wed Mar 10 11:34:44 2010 +0000
fence_scsi: Accept unknown option from standard input
Resolves: rhbz#532920
Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com>
---
fence/agents/scsi/fence_scsi.pl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl
index e452e7c..0c2ff51 100755
--- a/fence/agents/scsi/fence_scsi.pl
+++ b/fence/agents/scsi/fence_scsi.pl
@@ -260,7 +260,7 @@ sub get_options_stdin
}
else
{
- fail "parse error: unknown option \"$opt\"";
+ print STDERR "parse error: unknown option \"$opt\"\n";
}
}
}
14 years, 1 month
cluster: RHEL55 - 2.0.5 library fix from distcvs
by Christine Caulfield
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 90946b7f6b4bd8b4b03560b982bc5ca141d2b374
Parent: 77cce7cd52503f83e67e6d937183db30b6e47c1e
Author: Christine Caulfield <ccaulfie(a)redhat.com>
AuthorDate: Wed Mar 10 11:34:03 2010 +0000
Committer: Christine Caulfield <ccaulfie(a)redhat.com>
CommitterDate: Wed Mar 10 11:34:03 2010 +0000
2.0.5 library fix from distcvs
Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com>
---
cman/cman_tool/Makefile | 2 +-
cman/configure | 1 +
dlm/lib/Makefile | 2 ++
dlm/tool/Makefile | 2 +-
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/cman/cman_tool/Makefile b/cman/cman_tool/Makefile
index 47a75e6..767361d 100644
--- a/cman/cman_tool/Makefile
+++ b/cman/cman_tool/Makefile
@@ -29,7 +29,7 @@ TARGET=cman_tool
all: ${TARGET}
cman_tool: main.o join.o ../lib/libcman.a
- $(CC) $(LDFLAGS) -L$(ccslibdir) -o $@ $^ -L../lib -lccs
+ $(CC) $(LDFLAGS) -L$(ccslibdir) -o $@ $^ -L$(ccsincdir) -lccs
main.o: main.c cman_tool.h
$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/cman/configure b/cman/configure
index 681b008..da1a5d5 100755
--- a/cman/configure
+++ b/cman/configure
@@ -102,6 +102,7 @@ if (!$libexecdir) {
}
if (!$ccslibdir) {
$ccslibdir="${libdir}";
+ print "Setting ccslibdir to $ccslibdir\n";
}
if (!$mandir) {
$mandir="${prefix}/usr/share/man";
diff --git a/dlm/lib/Makefile b/dlm/lib/Makefile
index 0cd1b68..b73610e 100644
--- a/dlm/lib/Makefile
+++ b/dlm/lib/Makefile
@@ -38,9 +38,11 @@ $(LIBNAME)_lt.a: libdlm_lt.o
$(LIBNAME).so.${RELEASE_MAJOR}.${RELEASE_MINOR}: libdlm.po libaislock.po
$(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname=$(LIBNAME).so.$(RELEASE_MAJOR) $^
+ ln -sf $(LIBNAME).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(LIBNAME).so
$(LIBNAME)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}: libdlm_lt.po
$(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname=$(LIBNAME)_lt.so.$(RELEASE_MAJOR) $^
+ ln -sf $(LIBNAME)_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(LIBNAME)_lt.so
%_lt.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/dlm/tool/Makefile b/dlm/tool/Makefile
index 625b456..5a2884c 100644
--- a/dlm/tool/Makefile
+++ b/dlm/tool/Makefile
@@ -14,7 +14,7 @@ top_srcdir=..
include ${top_srcdir}/make/defines.mk
CFLAGS += -g -I. -I../lib/
-LDFLAGS += -ldlm
+LDFLAGS += -L../lib/ -ldlm
TARGET=dlm_tool
14 years, 1 month
cluster: RHEL55 - fence: Problems with -V in fence_sanbox and fence_vmware
by Christine Caulfield
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 77cce7cd52503f83e67e6d937183db30b6e47c1e
Parent: ac07c1e11e5a732ec80c5731f91307667a36ca31
Author: Christine Caulfield <ccaulfie(a)redhat.com>
AuthorDate: Wed Mar 10 09:40:01 2010 +0000
Committer: Christine Caulfield <ccaulfie(a)redhat.com>
CommitterDate: Wed Mar 10 09:40:01 2010 +0000
fence: Problems with -V in fence_sanbox and fence_vmware
fix for rhbz#549113
Signed-off-by: Marek 'marx' Grac <mgrac(a)redhat.com>
Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com>
---
fence/agents/sanbox2/Makefile | 6 +++---
fence/agents/vmware/fence_vmware.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fence/agents/sanbox2/Makefile b/fence/agents/sanbox2/Makefile
index 9428344..f6d84bb 100644
--- a/fence/agents/sanbox2/Makefile
+++ b/fence/agents/sanbox2/Makefile
@@ -22,9 +22,9 @@ all: $(TARGET)
$(TARGET): $(SOURCE)
: > $(TARGET)
awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
- echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
- ${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
- echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
+ echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+ ${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh REDHAT_COPYRIGHT >> $(TARGET)
+ echo "BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py
index 0d16ad9..7e51df5 100644
--- a/fence/agents/vmware/fence_vmware.py
+++ b/fence/agents/vmware/fence_vmware.py
@@ -23,7 +23,7 @@
#
import sys, re, pexpect, exceptions
-sys.path.append("/usr/bin/fence")
+sys.path.append("/usr/lib/fence")
from fencing import *
#BEGIN_VERSION_GENERATION
14 years, 1 month
gfs2-utils: master - cman: gfs_controld dm suspend hangs withdrawn GFS file system
by Bob Peterson
Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitd...
Commit: 3c4002c3101cb5e893295408fb819f77c285b6d0
Parent: 401978135300fac660a6a8b9ca2265c7b32e7e4e
Author: Bob Peterson <rpeterso(a)redhat.com>
AuthorDate: Tue Mar 9 09:28:34 2010 -0600
Committer: Bob Peterson <rpeterso(a)redhat.com>
CommitterDate: Tue Mar 9 10:39:58 2010 -0600
cman: gfs_controld dm suspend hangs withdrawn GFS file system
This patch changes gfs_controld such that if a device mapper (dm)
suspend needs to be done, it passes the --nolockfs and --noflush
parameters. Now that gfs and gfs2 are using the standard means
of calling freeze and thaw, a gfs withdraw will cause the
suspend uevent. Without those parameters, the file system is
permanently frozen with no way to unfreeze. (You can't unfreeze
it since gfs has withdrawn). In other words, a reboot of the
entire cluster it required to recover.
rhbz#571806
---
group/gfs_controld/util.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/group/gfs_controld/util.c b/group/gfs_controld/util.c
index d6d46ee..c2cb741 100644
--- a/group/gfs_controld/util.c
+++ b/group/gfs_controld/util.c
@@ -105,7 +105,8 @@ int run_dmsetup_suspend(struct mountgroup *mg, char *dev)
for (i = 0; i < 50; i++)
close(i);
- execlp("dmsetup", "dmsetup", "suspend", buf, NULL);
+ execlp("dmsetup", "dmsetup", "suspend", "--nolockfs",
+ "--noflush", buf, NULL);
exit(EXIT_FAILURE);
}
return -1;
14 years, 1 month